X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.plugins;h=1eb0c3f2909ed35954b9e1ca95426304bef9bbb4;hb=9395e7a086359069486e002c02b5777ca0c0df26;hp=1ab05431fb8d35634a5bb5617096ceff154ae211;hpb=2274270ea3b7a8eec0e8b7e6b5b8434610f05874;p=platform%2Fupstream%2Fconnman.git diff --git a/Makefile.plugins b/Makefile.plugins old mode 100644 new mode 100755 index 1ab0543..1eb0c3f --- a/Makefile.plugins +++ b/Makefile.plugins @@ -3,9 +3,6 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ @DBUS_CFLAGS@ @GLIB_CFLAGS@ plugin_ldflags = -no-undefined -module -avoid-version -script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ - @DBUS_CFLAGS@ - if LOOPBACK builtin_modules += loopback builtin_sources += plugins/loopback.c @@ -16,6 +13,11 @@ builtin_modules += ethernet builtin_sources += plugins/ethernet.c endif +if GADGET +builtin_modules += gadget +builtin_sources += plugins/gadget.c +endif + gsupplicant_sources = gsupplicant/gsupplicant.h gsupplicant/dbus.h \ gsupplicant/supplicant.c gsupplicant/dbus.c @@ -24,6 +26,11 @@ builtin_modules += wifi builtin_sources += plugins/wifi.c $(gsupplicant_sources) endif +if IWD +builtin_modules += iwd +builtin_sources += plugins/iwd.c +endif + if BLUETOOTH builtin_modules += bluetooth builtin_sources += plugins/bluetooth.c @@ -51,6 +58,18 @@ builtin_modules += dundee builtin_sources += plugins/dundee.c endif +if TELEPHONY +if TELEPHONY_BUILTIN +builtin_modules += telephony +builtin_sources += plugins/telephony.c +else +plugin_LTLIBRARIES += plugins/telephony.la +plugin_objects += $(plugins_telephony_la_OBJECTS) +plugins_telephony_la_CFLAGS = $(plugin_cflags) +plugins_telephony_la_LDFLAGS = $(plugin_ldflags) +endif +endif + if VPN builtin_modules += vpn builtin_sources += plugins/vpn.c @@ -68,7 +87,7 @@ vpn_plugins_openconnect_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/openconnect.c vpn_plugins_openconnect_la_CFLAGS = $(plugin_cflags) \ -DOPENCONNECT=\"@OPENCONNECT@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_openconnect_la_LDFLAGS = $(plugin_ldflags) endif @@ -86,12 +105,31 @@ vpn_plugin_objects += $(plugins_openvpn_la_OBJECTS) vpn_plugins_openvpn_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/openvpn.c vpn_plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@OPENVPN@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_openvpn_la_LDFLAGS = $(plugin_ldflags) endif endif +if IPSEC +if IPSEC_BUILTIN +builtin_vpn_modules += ipsec +builtin_vpn_sources += vpn/plugins/ipsec.h vpn/plugins/ipsec.c +builtin_vpn_sources += vpn/plugins/vici-client.h vpn/plugins/vici-client.c +builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h +builtin_vpn_cflags += -DIPSEC=\"@IPSEC@\" +else +vpn_plugin_LTLIBRARIES += vpn/plugins/ipsec.la +vpn_plugin_objects += $(plugins_ipsec_la_OBJECTS) +vpn_plugins_ipsec_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ + vpn/plugins/ipsec.c vpn/plugins/vici-client.c +vpn_plugins_ipsec_la_CFLAGS = $(plugin_cflags) -DIPSEC=\"@IPSEC@\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ + -DSCRIPTDIR=\""$(build_scriptdir)"\" @GIO_CFLAGS@ +vpn_plugins_ipsec_la_LDFLAGS = $(plugin_ldflags) @GIO_LIBS@ +endif +endif + if VPNC if VPNC_BUILTIN builtin_vpn_modules += vpnc @@ -104,7 +142,7 @@ vpn_plugin_objects += $(plugins_vpnc_la_OBJECTS) vpn_plugins_vpnc_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/vpnc.c vpn_plugins_vpnc_la_CFLAGS = $(plugin_cflags) -DVPNC=\"@VPNC@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_vpnc_la_LDFLAGS = $(plugin_ldflags) endif @@ -122,7 +160,7 @@ vpn_plugin_objects += $(plugins_l2tp_la_OBJECTS) vpn_plugins_l2tp_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/l2tp.c vpn_plugins_l2tp_la_CFLAGS = $(plugin_cflags) -DL2TP=\"@L2TP@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_l2tp_la_LDFLAGS = $(plugin_ldflags) endif @@ -141,7 +179,7 @@ vpn_plugins_pptp_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/pptp.c vpn_plugins_pptp_la_CFLAGS = $(plugin_cflags) -DPPPD=\"@PPPD@\" \ -DPPTP=\"@PPTP@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_pptp_la_LDFLAGS = $(plugin_ldflags) endif @@ -149,12 +187,12 @@ endif if PPTP script_LTLIBRARIES += scripts/libppp-plugin.la -scripts_libppp_plugin_la_LDFLAGS = $(script_cflags) @DBUS_CFLAGS@ +scripts_libppp_plugin_la_LDFLAGS = $(plugin_ldflags) 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_LDFLAGS = $(plugin_ldflags) scripts_libppp_plugin_la_LIBADD = @DBUS_LIBS@ endif endif @@ -184,15 +222,6 @@ endif endif endif -if IWMX -plugin_LTLIBRARIES += plugins/iwmxsdk.la -plugin_objects += $(plugins_iwmxsdk_la_OBJECTS) -plugins_iwmxsdk_la_SOURCES = plugins/iwmx.h plugins/iwmx.c plugins/iwmxsdk.c -plugins_iwmxsdk_la_CFLAGS = $(plugin_cflags) @IWMXSDK_CFLAGS@ -plugins_iwmxsdk_la_LIBADD = @IWMXSDK_LIBS@ @GLIB_LIBS@ -plugins_iwmxsdk_la_LDFLAGS = $(plugin_ldflags) -endif - if IOSPM plugin_LTLIBRARIES += plugins/iospm.la plugin_objects += $(plugins_iospm_la_OBJECTS) @@ -218,6 +247,12 @@ script_PROGRAMS += scripts/openvpn-script scripts_openvpn_script_LDADD = @DBUS_LIBS@ endif +if IPSEC +script_PROGRAMS += scripts/ipsec-script + +scripts_ipsec_script_LDADD = @DBUS_LIBS@ +endif + if NMCOMPAT builtin_modules += nmcompat builtin_sources += plugins/nmcompat.c @@ -235,16 +270,22 @@ plugins_tist_la_LDFLAGS = $(plugin_ldflags) endif endif -if SESSION_POLICY -if SESSION_POLICY_BUILTIN -builtin_modules += session_policy -builtin_sources += plugins/session_policy.c +if SESSION_POLICY_LOCAL +if SESSION_POLICY_LOCAL_BUILTIN +builtin_modules += session_policy_local +builtin_sources += plugins/session_policy_local.c else -plugin_LTLIBRARIES += plugins/session_policy.la -plugin_objects += $(plugins_session_policy_la_OBJECTS) -plugins_session_policy_la_CFLAGS = $(plugin_cflags) -plugins_session_policy_la_LDFLAGS = $(plugin_ldflags) +plugin_LTLIBRARIES += plugins/session_policy_local.la +plugin_objects += $(plugins_session_policy_local_la_OBJECTS) +plugins_session_policy_local_la_CFLAGS = $(plugin_cflags) \ + -DSTORAGEDIR=\""$(storagedir)\"" +plugins_session_policy_local_la_LDFLAGS = $(plugin_ldflags) +endif endif + +if NEARD +builtin_modules += neard +builtin_sources += plugins/neard.c endif EXTRA_DIST += plugins/polkit.policy @@ -254,9 +295,9 @@ if POLKIT $(AM_V_GEN)cp $< $@ endif -if VPN EXTRA_DIST += vpn/vpn-polkit.policy +if VPN vpn/net.connman.vpn.policy: vpn/vpn-polkit.policy if POLKIT $(AM_V_GEN)cp $< $@