X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.plugins;h=f959152c333cb8c864feaa9df882104cd7f98e86;hb=230905c20905f2bc5ccf4b8fab75c1b5df2ac31d;hp=e6b79b082b1334b83242b6a3b20cabbfca927c0d;hpb=cbb031b7308e800149f76537fc7ccbd1a40a0735;p=framework%2Fconnectivity%2Fconnman.git diff --git a/Makefile.plugins b/Makefile.plugins index e6b79b0..f959152 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -3,68 +3,30 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ @DBUS_CFLAGS@ @GLIB_CFLAGS@ plugin_ldflags = -no-undefined -module -avoid-version - -builtin_modules += dhcp -builtin_sources += plugins/dhcp.c +script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ + @DBUS_CFLAGS@ if LOOPBACK -if LOOPBACK_BUILTIN builtin_modules += loopback builtin_sources += plugins/loopback.c -else -plugin_LTLIBRARIES += plugins/loopback.la -plugin_objects += $(plugins_loopback_la_OBJECTS) -plugins_loopback_la_CFLAGS = $(plugin_cflags) -plugins_loopback_la_LDFLAGS = $(plugin_ldflags) -endif endif if ETHERNET -if ETHERNET_BUILTIN builtin_modules += ethernet builtin_sources += plugins/ethernet.c -else -plugin_LTLIBRARIES += plugins/ethernet.la -plugin_objects += $(plugins_ethernet_la_OBJECTS) -plugins_ethernet_la_CFLAGS = $(plugin_cflags) -plugins_ethernet_la_LDFLAGS = $(plugin_ldflags) -endif endif +gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \ + gsupplicant/supplicant.c gsupplicant/dbus.c + if WIFI -if WIFI_BUILTIN builtin_modules += wifi -builtin_sources += plugins/wifi.c -builtin_modules += wifi_legacy -builtin_sources += plugins/wifi-legacy.c \ - plugins/supplicant.h plugins/supplicant.c -else -plugin_LTLIBRARIES += plugins/wifi.la -plugin_objects += $(plugins_wifi_la_OBJECTS) -plugins_wifi_la_SOURCES = plugins/wifi.c -plugins_wifi_la_CFLAGS = $(plugin_cflags) -plugins_wifi_la_LDFLAGS = $(plugin_ldflags) - -plugin_LTLIBRARIES += plugins/wifi_legacy.la -plugin_objects += $(plugins_wifi_legacy_la_OBJECTS) -plugins_wifi_legacy_la_SOURCES = plugins/wifi-legacy.c \ - plugins/supplicant.h plugins/supplicant.c -plugins_wifi_legacy_la_CFLAGS = $(plugin_cflags) -plugins_wifi_legacy_la_LDFLAGS = $(plugin_ldflags) - -endif +builtin_sources += plugins/wifi.c $(gsupplicant_sources) endif if BLUETOOTH -if BLUETOOTH_BUILTIN builtin_modules += bluetooth builtin_sources += plugins/bluetooth.c -else -plugin_LTLIBRARIES += plugins/bluetooth.la -plugin_objects += $(plugins_bluetooth_la_OBJECTS) -plugins_bluetooth_la_CFLAGS = $(plugin_cflags) -plugins_bluetooth_la_LDFLAGS = $(plugin_ldflags) -endif endif if HH2SERIAL_GPS @@ -80,40 +42,26 @@ endif endif if OFONO -if OFONO_BUILTIN builtin_modules += ofono -builtin_sources += plugins/ofono.c -else -plugin_LTLIBRARIES += plugins/ofono.la -plugin_objects += $(plugins_ofono_la_OBJECTS) -plugins_ofono_la_CFLAGS = $(plugin_cflags) -plugins_ofono_la_LDFLAGS = $(plugin_ldflags) -endif +builtin_sources += plugins/mcc.h plugins/ofono.c endif -if DHCLIENT -if DHCLIENT_BUILTIN -builtin_modules += dhclient -builtin_sources += plugins/dhclient.c -builtin_cflags += -DDHCLIENT=\"@DHCLIENT@\" -else -plugin_LTLIBRARIES += plugins/dhclient.la -plugin_objects += $(plugins_dhclient_la_OBJECTS) -plugins_dhclient_la_CFLAGS = $(plugin_cflags) -DDHCLIENT=\"@DHCLIENT@\" \ - -DSTATEDIR=\""$(statedir)"\" \ - -DSCRIPTDIR=\""$(build_scriptdir)"\" -plugins_dhclient_la_LDFLAGS = $(plugin_ldflags) -endif +if DUNDEE +builtin_modules += dundee +builtin_sources += plugins/dundee.c endif if OPENCONNECT if OPENCONNECT_BUILTIN builtin_modules += openconnect builtin_sources += plugins/openconnect.c +builtin_vpn_sources = plugins/vpn.c plugins/vpn.h builtin_cflags += -DOPENCONNECT=\"@OPENCONNECT@\" else plugin_LTLIBRARIES += plugins/openconnect.la plugin_objects += $(plugins_openconnect_la_OBJECTS) +plugins_openconnect_la_SOURCES = plugins/vpn.h plugins/vpn.c \ + plugins/openconnect.c plugins_openconnect_la_CFLAGS = $(plugin_cflags) -DOPENCONNECT=\"@OPENCONNECT@\" \ -DSTATEDIR=\""$(statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" @@ -121,81 +69,106 @@ plugins_openconnect_la_LDFLAGS = $(plugin_ldflags) endif endif -if PORTAL -if PORTAL_BUILTIN -builtin_modules += portal -builtin_sources += plugins/portal.c +if OPENVPN +if OPENVPN_BUILTIN +builtin_modules += openvpn +builtin_sources += plugins/openvpn.c +builtin_vpn_sources = plugins/vpn.c plugins/vpn.h +builtin_cflags += -DOPENVPN=\"@OPENVPN@\" else -plugin_LTLIBRARIES += plugins/portal.la -plugin_objects += $(plugins_portal_la_OBJECTS) -plugins_portal_la_CFLAGS = $(plugin_cflags) -plugins_portal_la_LDFLAGS = $(plugin_ldflags) +plugin_LTLIBRARIES += plugins/openvpn.la +plugin_objects += $(plugins_openvpn_la_OBJECTS) +plugins_openvpn_la_SOURCES = plugins/vpn.h plugins/vpn.c \ + plugins/openvpn.c +plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@OPENVPN@\" \ + -DSTATEDIR=\""$(statedir)"\" \ + -DSCRIPTDIR=\""$(build_scriptdir)"\" +plugins_openvpn_la_LDFLAGS = $(plugin_ldflags) endif endif -if DNSPROXY -if DNSPROXY_BUILTIN -builtin_modules += dnsproxy -builtin_sources += plugins/dnsproxy.c +if VPNC +if VPNC_BUILTIN +builtin_modules += vpnc +builtin_sources += plugins/vpnc.c +builtin_vpn_sources = plugins/vpn.c plugins/vpn.h +builtin_cflags += -DVPNC=\"@VPNC@\" else -plugin_LTLIBRARIES += plugins/dnsproxy.la -plugin_objects += $(plugins_dnsproxy_la_OBJECTS) -plugins_dnsproxy_la_CFLAGS = $(plugin_cflags) -plugins_dnsproxy_la_LDFLAGS = $(plugin_ldflags) +plugin_LTLIBRARIES += plugins/vpnc.la +plugin_objects += $(plugins_vpnc_la_OBJECTS) +plugins_vpnc_la_SOURCES = plugins/vpn.h plugins/vpn.c \ + plugins/vpnc.c +plugins_vpnc_la_CFLAGS = $(plugin_cflags) -DVPNC=\"@VPNC@\" \ + -DSTATEDIR=\""$(statedir)"\" \ + -DSCRIPTDIR=\""$(build_scriptdir)"\" +plugins_vpnc_la_LDFLAGS = $(plugin_ldflags) endif endif -if PACRUNNER -if PACRUNNER_BUILTIN -builtin_modules += pacrunner -builtin_sources += plugins/pacrunner.c +if L2TP +if L2TP_BUILTIN +builtin_modules += l2tp +builtin_sources += plugins/l2tp.c +builtin_vpn_sources = plugins/vpn.c plugins/vpn.h +builtin_cflags += -DL2TP=\"@L2TP@\" else -plugin_LTLIBRARIES += plugins/pacrunner.la -plugin_objects += $(plugins_pacrunner_la_OBJECTS) -plugins_pacrunner_la_CFLAGS = $(plugin_cflags) -plugins_pacrunner_la_LDFLAGS = $(plugin_ldflags) +plugin_LTLIBRARIES += plugins/l2tp.la +plugin_objects += $(plugins_l2tp_la_OBJECTS) +plugins_l2tp_la_SOURCES = plugins/vpn.h plugins/vpn.c \ + plugins/l2tp.c +plugins_l2tp_la_CFLAGS = $(plugin_cflags) -DL2TP=\"@L2TP@\" \ + -DSTATEDIR=\""$(statedir)"\" \ + -DSCRIPTDIR=\""$(build_scriptdir)"\" +plugins_l2tp_la_LDFLAGS = $(plugin_ldflags) endif endif -if GOOGLE -if GOOGLE_BUILTIN -builtin_modules += google -builtin_sources += plugins/google.c +if PPTP +if PPTP_BUILTIN +builtin_modules += pptp +builtin_sources += plugins/pptp.c +builtin_vpn_sources = plugins/vpn.c plugins/vpn.h +builtin_cflags += -DPPPD=\"@PPPD@\" -DPPTP=\"@PPTP@\" else -plugin_LTLIBRARIES += plugins/google.la -plugin_objects += $(plugins_google_la_OBJECTS) -plugins_google_la_CFLAGS = $(plugin_cflags) -plugins_google_la_LDFLAGS = $(plugin_ldflags) +plugin_LTLIBRARIES += plugins/pptp.la +plugin_objects += $(plugins_pptp_la_OBJECTS) +plugins_pptp_la_SOURCES = plugins/vpn.h plugins/vpn.c \ + plugins/pptp.c +plugins_pptp_la_CFLAGS = $(plugin_cflags) -DPPPD=\"@PPPD@\" \ + -DPPTP=\"@PPTP@\" \ + -DSTATEDIR=\""$(statedir)"\" \ + -DSCRIPTDIR=\""$(build_scriptdir)"\" +plugins_pptp_la_LDFLAGS = $(plugin_ldflags) endif endif -if MEEGO -if MEEGO_BUILTIN -builtin_modules += meego -builtin_sources += plugins/meego.c +if PPTP +script_LTLIBRARIES += scripts/libppp-plugin.la +scripts_libppp_plugin_la_LDFLAGS = $(script_cflags) @DBUS_CFLAGS@ +scripts_libppp_plugin_la_LIBADD = @DBUS_LIBS@ else -plugin_LTLIBRARIES += plugins/meego.la -plugin_objects += $(plugins_meego_la_OBJECTS) -plugins_meego_la_CFLAGS = $(plugin_cflags) -plugins_meego_la_LDFLAGS = $(plugin_ldflags) +if L2TP +script_LTLIBRARIES += scripts/libppp-plugin.la +scripts_libppp_plugin_la_LDFLAGS = $(script_cflags) @DBUS_CFLAGS@ +scripts_libppp_plugin_la_LIBADD = @DBUS_LIBS@ +endif endif + +builtin_sources += $(builtin_vpn_sources) + +if PACRUNNER +builtin_modules += pacrunner +builtin_sources += plugins/pacrunner.c endif if POLKIT -if POLKIT_BUILTIN builtin_modules += polkit builtin_sources += plugins/polkit.c -else -plugin_LTLIBRARIES += plugins/polkit.la -plugin_objects += $(plugins_polkit_la_OBJECTS) -plugins_polkit_la_CFLAGS = $(plugin_cflags) -plugins_polkit_la_LDFLAGS = $(plugin_ldflags) -endif if DATAFILES policydir = @POLKIT_DATADIR@ -policy_DATA = plugins/connman.policy +policy_DATA = plugins/net.connman.policy endif endif @@ -215,43 +188,44 @@ plugins_iospm_la_CFLAGS = $(plugin_cflags) plugins_iospm_la_LDFLAGS = $(plugin_ldflags) endif -if FAKE -plugin_LTLIBRARIES += plugins/fake.la -plugin_objects += $(plugins_fake_la_OBJECTS) -plugins_fake_la_CFLAGS = $(plugin_cflags) -plugins_fake_la_LDFLAGS = $(plugin_ldflags) -endif - - if OPENCONNECT script_PROGRAMS += scripts/openconnect-script scripts_openconnect_script_LDADD = @DBUS_LIBS@ +else +if VPNC +script_PROGRAMS += scripts/openconnect-script + +scripts_openconnect_script_LDADD = @DBUS_LIBS@ +endif endif -if DHCLIENT -script_DATA += scripts/dhclient.conf -script_PROGRAMS += scripts/dhclient-script +if OPENVPN +script_PROGRAMS += scripts/openvpn-script + +scripts_openvpn_script_LDADD = @DBUS_LIBS@ +endif -scripts_dhclient_script_LDADD = @DBUS_LIBS@ +if NMCOMPAT +builtin_modules += nmcompat +builtin_sources += plugins/nmcompat.c endif -if NTPD -if NTPD_BUILTIN -builtin_modules += ntpd -builtin_sources += plugins/ntpd.c -builtin_cflags += -DNTPD=\"@NTPD@\" +if TIST +if TIST_BUILTIN +builtin_modules += tist +builtin_sources += plugins/tist.c else -plugin_LTLIBRARIES += plugins/ntpd.la -plugin_objects += $(plugins_ntpd_la_OBJECTS) -plugins_ntpd_la_CFLAGS = $(plugin_cflags) -DNTPD=\"@NTPD@\" -plugins_ntpd_la_LDFLAGS = $(plugin_ldflags) +plugin_LTLIBRARIES += plugins/tist.la +plugin_objects += $(plugins_tist_la_OBJECTS) +plugins_tist_la_CFLAGS = $(plugin_cflags) +plugins_tist_la_LDFLAGS = $(plugin_ldflags) endif endif -EXTRA_DIST += plugins/polkit.policy scripts/dhclient.conf +EXTRA_DIST += plugins/polkit.policy -plugins/connman.policy: plugins/polkit.policy +plugins/net.connman.policy: plugins/polkit.policy if POLKIT $(AM_V_GEN)cp $< $@ endif