Split the GET and POST method APIs

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

diff --git a/Makefile.plugins b/Makefile.plugins
index 0a7424e..f4b4630 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -4,6 +4,9 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
 plugin_ldflags = -no-undefined -module -avoid-version
 
 
+builtin_modules += dhcp
+builtin_sources += plugins/dhcp.c
+
 if LOOPBACK
 if LOOPBACK_BUILTIN
 builtin_modules += loopback
@@ -31,14 +34,24 @@ endif
 if WIFI
 if WIFI_BUILTIN
 builtin_modules += wifi
-builtin_sources += plugins/wifi.c plugins/supplicant.h plugins/supplicant.c
+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/supplicant.h plugins/supplicant.c
+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
 endif
 
@@ -78,22 +91,6 @@ plugins_ofono_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-if UDHCP
-if UDHCP_BUILTIN
-builtin_modules += udhcp
-builtin_sources += plugins/udhcp.c
-builtin_cflags += -DUDHCPC=\"@UDHCPC@\"
-else
-plugin_LTLIBRARIES += plugins/udhcp.la
-plugin_objects += $(plugins_udhcp_la_OBJECTS)
-plugins_udhcp_la_SOURCES = plugins/udhcp.c
-plugins_udhcp_la_CFLAGS = $(plugin_cflags) -DUDHCPC=\"@UDHCPC@\" \
-                                       -DSTATEDIR=\""$(statedir)"\" \
-                                       -DSCRIPTDIR=\""$(build_scriptdir)"\"
-plugins_udhcp_la_LDFLAGS = $(plugin_ldflags)
-endif
-endif
-
 if DHCLIENT
 if DHCLIENT_BUILTIN
 builtin_modules += dhclient
@@ -109,27 +106,16 @@ plugins_dhclient_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-if RESOLVCONF
-if RESOLVCONF_BUILTIN
-builtin_modules += resolvconf
-builtin_sources += plugins/resolvconf.c
-builtin_cflags += -DRESOLVCONF=\"@RESOLVCONF@\"
-else
-plugin_LTLIBRARIES += plugins/resolvconf.la
-plugin_objects += $(plugins_resolvconf_la_OBJECTS)
-plugins_resolvconf_la_CFLAGS = $(plugin_cflags) -DRESOLVCONF=\"@RESOLVCONF@\"
-plugins_resolvconf_la_LDFLAGS = $(plugin_ldflags)
-endif
-endif
-
 if OPENCONNECT
 if OPENCONNECT_BUILTIN
 builtin_modules += openconnect
-builtin_sources += plugins/openconnect.c
+builtin_sources += plugins/vpn.c plugins/openconnect.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)"\"
@@ -161,6 +147,18 @@ plugins_dnsproxy_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
+if PACRUNNER
+if PACRUNNER_BUILTIN
+builtin_modules += pacrunner
+builtin_sources += plugins/pacrunner.c
+else
+plugin_LTLIBRARIES += plugins/pacrunner.la
+plugin_objects += $(plugins_pacrunner_la_OBJECTS)
+plugins_pacrunner_la_CFLAGS = $(plugin_cflags)
+plugins_pacrunner_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
 if GOOGLE
 if GOOGLE_BUILTIN
 builtin_modules += google
@@ -189,13 +187,10 @@ if POLKIT
 if POLKIT_BUILTIN
 builtin_modules += polkit
 builtin_sources += plugins/polkit.c
-builtin_libadd += @POLKIT_LIBS@
-builtin_cflags += @POLKIT_CFLAGS@
 else
 plugin_LTLIBRARIES += plugins/polkit.la
 plugin_objects += $(plugins_polkit_la_OBJECTS)
-plugins_polkit_la_CFLAGS = $(plugin_cflags) @POLKIT_CFLAGS@
-plugins_polkit_la_LIBADD = @POLKIT_LIBS@ @GLIB_LIBS@
+plugins_polkit_la_CFLAGS = $(plugin_cflags)
 plugins_polkit_la_LDFLAGS = $(plugin_ldflags)
 endif
 
@@ -230,12 +225,6 @@ plugins_fake_la_LDFLAGS = $(plugin_ldflags)
 endif
 
 
-if UDHCP
-script_PROGRAMS += scripts/udhcpc-script
-
-scripts_udhcpc_script_LDADD = @DBUS_LIBS@
-endif
-
 if OPENCONNECT
 script_PROGRAMS += scripts/openconnect-script