technology: return already enabled when tethering is enabled

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

diff --git a/Makefile.plugins b/Makefile.plugins
index 0859df3..f959152 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -7,57 +7,26 @@ script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
                                        @DBUS_CFLAGS@
 
 if LOOPBACK
-if LOOPBACK_BUILTIN
 builtin_modules += loopback
 builtin_sources += plugins/loopback.c
-else
-plugin_LTLIBRARIES += plugins/loopback.la
-plugin_objects += $(plugins_loopback_la_OBJECTS)
-plugins_loopback_la_CFLAGS = $(plugin_cflags)
-plugins_loopback_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if ETHERNET
-if ETHERNET_BUILTIN
 builtin_modules += ethernet
 builtin_sources += plugins/ethernet.c
-else
-plugin_LTLIBRARIES += plugins/ethernet.la
-plugin_objects += $(plugins_ethernet_la_OBJECTS)
-plugins_ethernet_la_CFLAGS = $(plugin_cflags)
-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 $(gsupplicant_sources)
-
-else
-plugin_LTLIBRARIES += plugins/wifi.la
-plugin_objects += $(plugins_wifi_la_OBJECTS)
-plugins_wifi_la_SOURCES = plugins/wifi.c $(gsupplicant_sources)
-plugins_wifi_la_CFLAGS = $(plugin_cflags)
-plugins_wifi_la_LDFLAGS = $(plugin_ldflags)
-
-endif
 endif
 
 if BLUETOOTH
-if BLUETOOTH_BUILTIN
 builtin_modules += bluetooth
 builtin_sources += plugins/bluetooth.c
-else
-plugin_LTLIBRARIES += plugins/bluetooth.la
-plugin_objects += $(plugins_bluetooth_la_OBJECTS)
-plugins_bluetooth_la_CFLAGS = $(plugin_cflags)
-plugins_bluetooth_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if HH2SERIAL_GPS
@@ -73,16 +42,13 @@ endif
 endif
 
 if OFONO
-if OFONO_BUILTIN
 builtin_modules += ofono
 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
+
+if DUNDEE
+builtin_modules += dundee
+builtin_sources += plugins/dundee.c
 endif
 
 if OPENCONNECT
@@ -191,39 +157,13 @@ endif
 builtin_sources += $(builtin_vpn_sources)
 
 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
-builtin_sources += plugins/google.c
-else
-plugin_LTLIBRARIES += plugins/google.la
-plugin_objects += $(plugins_google_la_OBJECTS)
-plugins_google_la_CFLAGS = $(plugin_cflags)
-plugins_google_la_LDFLAGS = $(plugin_ldflags)
-endif
 endif
 
 if POLKIT
-if POLKIT_BUILTIN
 builtin_modules += polkit
 builtin_sources += plugins/polkit.c
-else
-plugin_LTLIBRARIES += plugins/polkit.la
-plugin_objects += $(plugins_polkit_la_OBJECTS)
-plugins_polkit_la_CFLAGS = $(plugin_cflags)
-plugins_polkit_la_LDFLAGS = $(plugin_ldflags)
-endif
 
 if DATAFILES
 policydir = @POLKIT_DATADIR@
@@ -248,13 +188,6 @@ plugins_iospm_la_CFLAGS = $(plugin_cflags)
 plugins_iospm_la_LDFLAGS = $(plugin_ldflags)
 endif
 
-if FAKE
-plugin_LTLIBRARIES += plugins/fake.la
-plugin_objects += $(plugins_fake_la_OBJECTS)
-plugins_fake_la_CFLAGS = $(plugin_cflags)
-plugins_fake_la_LDFLAGS = $(plugin_ldflags)
-endif
-
 if OPENCONNECT
 script_PROGRAMS += scripts/openconnect-script
 
@@ -274,15 +207,8 @@ scripts_openvpn_script_LDADD = @DBUS_LIBS@
 endif
 
 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