Mention David's contributions

[framework/connectivity/connman.git] / Makefile.plugins

diff --git a/Makefile.plugins b/Makefile.plugins
index f4b4630..07aa1db 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -31,17 +31,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_sources += plugins/wifi.c $(gsupplicant_sources)
+
 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_SOURCES = plugins/wifi.c $(gsupplicant_sources)
 plugins_wifi_la_CFLAGS = $(plugin_cflags)
 plugins_wifi_la_LDFLAGS = $(plugin_ldflags)
 
@@ -109,7 +113,7 @@ 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_cflags += -DOPENCONNECT=\"@OPENCONNECT@\"
 else
 plugin_LTLIBRARIES += plugins/openconnect.la
@@ -123,6 +127,31 @@ plugins_openconnect_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
+if OPENVPN
+if OPENVPN_BUILTIN
+builtin_modules += openvpn
+builtin_sources += plugins/openvpn.c
+builtin_cflags += -DOPENVPN=\"@OPENVPN@\"
+else
+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 OPENCONNECT_BUILTIN
+builtin_sources += plugins/vpn.c plugins/vpn.h
+else
+if OPENVPN_BUILTIN
+builtin_sources += plugins/vpn.c plugins/vpn.h
+endif
+endif
+
 if PORTAL
 if PORTAL_BUILTIN
 builtin_modules += portal
@@ -224,13 +253,18 @@ 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@
 endif
 
+if OPENVPN
+script_PROGRAMS += scripts/openvpn-script
+
+scripts_openvpn_script_LDADD = @DBUS_LIBS@
+endif
+
 if DHCLIENT
 script_DATA += scripts/dhclient.conf
 script_PROGRAMS += scripts/dhclient-script