X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.plugins;h=58b0494402c8f3155e8b39cb0af0fb3f2a7632d0;hb=0baf5237502d01fcc977ef973aafd9800065548d;hp=f4b463034eb54ad09ee30061c107b1112a66c349;hpb=26911d4f9b29fd9f93822f52ae6db2c7738a7aa5;p=framework%2Fconnectivity%2Fconnman.git diff --git a/Makefile.plugins b/Makefile.plugins index f4b4630..58b0494 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -3,9 +3,8 @@ 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 @@ -31,27 +30,21 @@ 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 +builtin_sources += plugins/wifi.c $(gsupplicant_sources) + else plugin_LTLIBRARIES += plugins/wifi.la plugin_objects += $(plugins_wifi_la_OBJECTS) -plugins_wifi_la_SOURCES = plugins/wifi.c +plugins_wifi_la_SOURCES = plugins/wifi.c $(gsupplicant_sources) 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 endif @@ -82,34 +75,21 @@ endif if OFONO if OFONO_BUILTIN builtin_modules += ofono -builtin_sources += plugins/ofono.c +builtin_sources += plugins/mcc.h plugins/ofono.c else plugin_LTLIBRARIES += plugins/ofono.la plugin_objects += $(plugins_ofono_la_OBJECTS) +plugins_ofono_la_SOURCES = plugins/mcc.h plugins/ofono.c plugins_ofono_la_CFLAGS = $(plugin_cflags) plugins_ofono_la_LDFLAGS = $(plugin_ldflags) endif 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 -endif - if OPENCONNECT if OPENCONNECT_BUILTIN builtin_modules += openconnect -builtin_sources += plugins/vpn.c plugins/openconnect.c plugins/vpn.h +builtin_sources += plugins/openconnect.c +builtin_vpn_sources = plugins/vpn.c plugins/vpn.h builtin_cflags += -DOPENCONNECT=\"@OPENCONNECT@\" else plugin_LTLIBRARIES += plugins/openconnect.la @@ -123,30 +103,93 @@ 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 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/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 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/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 PPTP +script_LTLIBRARIES += scripts/libppp-plugin.la +scripts_libppp_plugin_la_LDFLAGS = $(script_cflags) @DBUS_CFLAGS@ +scripts_libppp_plugin_la_LIBADD = @DBUS_LIBS@ +else +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 if PACRUNNER_BUILTIN builtin_modules += pacrunner @@ -197,7 +240,7 @@ endif if DATAFILES policydir = @POLKIT_DATADIR@ -policy_DATA = plugins/connman.policy +policy_DATA = plugins/net.connman.policy endif endif @@ -224,18 +267,22 @@ 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_dhclient_script_LDADD = @DBUS_LIBS@ +scripts_openvpn_script_LDADD = @DBUS_LIBS@ endif if NTPD @@ -251,9 +298,33 @@ plugins_ntpd_la_LDFLAGS = $(plugin_ldflags) endif endif -EXTRA_DIST += plugins/polkit.policy scripts/dhclient.conf +if NMCOMPAT +if NMCOMPAT_BUILTIN +builtin_modules += nmcompat +builtin_sources += plugins/nmcompat.c +else +plugin_LTLIBRARIES += plugins/nmcompat.la +plugin_objects += $(plugins_nmcompat_la_OBJECTS) +plugins_nmcompat_la_CFLAGS = $(plugin_cflags) +plugins_nmcompat_la_LDFLAGS = $(plugin_ldflags) +endif +endif + +if TIST +if TIST_BUILTIN +builtin_modules += tist +builtin_sources += plugins/tist.c +else +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 -plugins/connman.policy: plugins/polkit.policy +plugins/net.connman.policy: plugins/polkit.policy if POLKIT $(AM_V_GEN)cp $< $@ endif