X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.plugins;h=a0c17cfa3033e80fad826add660c655e38422ea5;hb=5479dad2b3b5f342f51ca6e7ec8a5a501820bd55;hp=c8ae2d1532447019a24d22e9709664623e68aef1;hpb=376f28aa4b82ec003c8579968ba42ff3050b10c5;p=platform%2Fupstream%2Fconnman.git diff --git a/Makefile.plugins b/Makefile.plugins index c8ae2d1..a0c17cf 100755 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -1,6 +1,6 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ - @DBUS_CFLAGS@ @GLIB_CFLAGS@ + @DLOG_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ plugin_ldflags = -no-undefined -module -avoid-version if LOOPBACK @@ -26,9 +26,12 @@ 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_legacy -builtin_sources += plugins/bluetooth_legacy.c builtin_modules += bluetooth builtin_sources += plugins/bluetooth.c endif @@ -71,36 +74,63 @@ if VPN builtin_modules += vpn builtin_sources += plugins/vpn.c +if WIREGUARD +builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h +if WIREGUARD_BUILTIN +builtin_vpn_modules += wireguard +builtin_vpn_sources += src/shared/mnlg.h src/shared/mnlg.c \ + vpn/plugins/wireguard.h vpn/plugins/libwireguard.c \ + vpn/plugins/wireguard.c +builtin_vpn_cflags += @LIBMNL_CFLAGS@ -DWIREGUARD=\"@WIREGUARD@\" +builtin_vpn_libadd += @LIBMNL_LIBS@ +else +vpn_plugin_LTLIBRARIES += vpn/plugins/wireguard.la +vpn_plugin_objects += $(plugins_wireguard_la_OBJECTS) +vpn_plugins_wireguard_la_SOURCES = src/shared/mnlg.h src/shared/mnlg.c \ + vpn/plugins/wireguard.h \ + vpn/plugins/libwireguard.c \ + vpn/plugins/wireguard.c +vpn_plugins_wireguard_la_CFLAGS = $(plugin_cflags) @LIBMNL_CFLAGS@ \ + -DWIREGUARD=\"@WIREGUARD@\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ + -DSCRIPTDIR=\""$(build_scriptdir)"\" +vpn_plugins_wireguard_la_LDFLAGS = $(plugin_ldflags) +vpn_plugins_wireguard_la_LIBADD = @LIBMNL_LIBS@ +endif +endif + if OPENCONNECT +builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h if OPENCONNECT_BUILTIN builtin_vpn_modules += openconnect builtin_vpn_sources += vpn/plugins/openconnect.c -builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h -builtin_vpn_cflags += -DOPENCONNECT=\"@OPENCONNECT@\" +builtin_vpn_cflags += -DOPENCONNECT=\"@OPENCONNECT@\" \ + @LIBOPENCONNECT_CFLAGS@ +builtin_vpn_libadd += @LIBOPENCONNECT_LIBS@ else vpn_plugin_LTLIBRARIES += vpn/plugins/openconnect.la vpn_plugin_objects += $(plugins_openconnect_la_OBJECTS) -vpn_plugins_openconnect_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ - vpn/plugins/openconnect.c +vpn_plugins_openconnect_la_SOURCES = vpn/plugins/openconnect.c vpn_plugins_openconnect_la_CFLAGS = $(plugin_cflags) \ -DOPENCONNECT=\"@OPENCONNECT@\" \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ - -DSCRIPTDIR=\""$(build_scriptdir)"\" + -DSCRIPTDIR=\""$(build_scriptdir)"\" \ + @LIBOPENCONNECT_CFLAGS@ vpn_plugins_openconnect_la_LDFLAGS = $(plugin_ldflags) +vpn_plugins_openconnect_la_LIBADD = @LIBOPENCONNECT_LIBS@ endif endif if OPENVPN +builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h if OPENVPN_BUILTIN builtin_vpn_modules += openvpn builtin_vpn_sources += vpn/plugins/openvpn.c -builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h builtin_vpn_cflags += -DOPENVPN=\"@OPENVPN@\" else vpn_plugin_LTLIBRARIES += vpn/plugins/openvpn.la 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_SOURCES = vpn/plugins/openvpn.c vpn_plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@OPENVPN@\" \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" @@ -119,25 +149,24 @@ 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/ipsec.c vpn/plugins/vici-client.c vpn_plugins_ipsec_la_CFLAGS = $(plugin_cflags) -DIPSEC=\"@IPSEC@\" \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ - -DSCRIPTDIR=\""$(build_scriptdir)"\" -vpn_plugins_ipsec_la_LDFLAGS = $(plugin_ldflags) + -DSCRIPTDIR=\""$(build_scriptdir)"\" @GIO_CFLAGS@ +vpn_plugins_ipsec_la_LDFLAGS = $(plugin_ldflags) @GIO_LIBS@ endif endif if VPNC +builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h if VPNC_BUILTIN builtin_vpn_modules += vpnc builtin_vpn_sources += vpn/plugins/vpnc.c -builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h builtin_vpn_cflags += -DVPNC=\"@VPNC@\" else vpn_plugin_LTLIBRARIES += vpn/plugins/vpnc.la 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_SOURCES = vpn/plugins/vpnc.c vpn_plugins_vpnc_la_CFLAGS = $(plugin_cflags) -DVPNC=\"@VPNC@\" \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" @@ -146,16 +175,15 @@ endif endif if L2TP +builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h if L2TP_BUILTIN builtin_vpn_modules += l2tp builtin_vpn_sources += vpn/plugins/l2tp.c -builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h builtin_vpn_cflags += -DL2TP=\"@L2TP@\" else vpn_plugin_LTLIBRARIES += vpn/plugins/l2tp.la 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_SOURCES = vpn/plugins/l2tp.c vpn_plugins_l2tp_la_CFLAGS = $(plugin_cflags) -DL2TP=\"@L2TP@\" \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" @@ -164,16 +192,15 @@ endif endif if PPTP +builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h if PPTP_BUILTIN builtin_vpn_modules += pptp builtin_vpn_sources += vpn/plugins/pptp.c -builtin_vpn_source = vpn/plugins/vpn.c vpn/plugins/vpn.h builtin_vpn_cflags += -DPPPD=\"@PPPD@\" -DPPTP=\"@PPTP@\" else vpn_plugin_LTLIBRARIES += vpn/plugins/pptp.la vpn_plugin_objects += $(plugins_pptp_la_OBJECTS) -vpn_plugins_pptp_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ - vpn/plugins/pptp.c +vpn_plugins_pptp_la_SOURCES = vpn/plugins/pptp.c vpn_plugins_pptp_la_CFLAGS = $(plugin_cflags) -DPPPD=\"@PPPD@\" \ -DPPTP=\"@PPTP@\" \ -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ @@ -227,27 +254,25 @@ plugins_iospm_la_LDFLAGS = $(plugin_ldflags) endif if OPENCONNECT -script_PROGRAMS += scripts/openconnect-script - -scripts_openconnect_script_LDADD = @DBUS_LIBS@ +scripts_openconnect_script_LDADD = @DBUS_LIBS@ @DLOG_LIBS@ else if VPNC -script_PROGRAMS += scripts/openconnect-script +script_PROGRAMS += scripts/vpn-script -scripts_openconnect_script_LDADD = @DBUS_LIBS@ +scripts_vpn_script_LDADD = @DBUS_LIBS@ endif endif if OPENVPN script_PROGRAMS += scripts/openvpn-script -scripts_openvpn_script_LDADD = @DBUS_LIBS@ +scripts_openvpn_script_LDADD = @DBUS_LIBS@ @DLOG_LIBS@ endif if IPSEC script_PROGRAMS += scripts/ipsec-script -scripts_ipsec_script_LDADD = @DBUS_LIBS@ +scripts_ipsec_script_LDADD = @DBUS_LIBS@ @DLOG_LIBS@ endif if NMCOMPAT