Return an error when trying to connect hidden networks

[connman] / plugins / Makefile.am

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2fb6017..1530c0d 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -5,6 +5,7 @@ plugin_LTLIBRARIES =
 
 builtin_modules =
 builtin_sources =
+builtin_cflags =
 
 if LOOPBACK
 if LOOPBACK_BUILTIN
@@ -26,70 +27,98 @@ endif
 endif
 
 if WIFI
+if WIFI_BUILTIN
+builtin_modules += wifi
+builtin_sources += wifi.c inet.h inet.c supplicant.h supplicant.c
+else
 plugin_LTLIBRARIES += wifi.la
-
 wifi_la_SOURCES = wifi.c inet.h inet.c supplicant.h supplicant.c
 wifi_la_LIBADD = @GDBUS_LIBS@
 endif
+endif
 
 if BLUETOOTH
+if BLUETOOTH_BUILTIN
+builtin_modules += bluetooth
+builtin_sources += bluetooth.c inet.h inet.c
+else
 plugin_LTLIBRARIES += bluetooth.la
-
 bluetooth_la_SOURCES = bluetooth.c inet.h inet.c
 bluetooth_la_LIBADD = @GDBUS_LIBS@
 endif
+endif
+
+if OFONO
+if OFONO_BUILTIN
+builtin_modules += ofono
+builtin_sources += ofono.c
+else
+plugin_LTLIBRARIES += ofono.la
+bluetooth_la_LIBADD = @GDBUS_LIBS@
+endif
+endif
 
 if MODEMMGR
 plugin_LTLIBRARIES += modemmgr.la
-
 modemmgr_la_LIBADD = @GDBUS_LIBS@
 endif
 
 if NOVATEL
 plugin_LTLIBRARIES += novatel.la
-
 novatel_la_SOURCES = novatel.c modem.h modem.c
 endif
 
 if HUAWEI
 plugin_LTLIBRARIES += huawei.la
-
 huawei_la_SOURCES = huawei.c modem.h modem.c
 endif
 
 if HSO
 plugin_LTLIBRARIES += hso.la
-
 hso_la_SOURCES = hso.c modem.h modem.c
 endif
 
 if UDHCP
+if UDHCP_BUILTIN
+builtin_modules += udhcp
+builtin_sources += udhcp.c inet.h inet.c task.h task.c
+builtin_cflags += -DUDHCPC=\"@UDHCPC@\"
+else
 plugin_LTLIBRARIES += udhcp.la
-
 udhcp_la_SOURCES = udhcp.c inet.h inet.c task.h task.c
 udhcp_la_CFLAGS = $(AM_CFLAGS) -DUDHCPC=\"@UDHCPC@\" \
                -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
 endif
+endif
 
 if DHCLIENT
+if DHCLIENT_BUILTIN
+builtin_modules += dhclient
+builtin_sources += dhclient.c inet.h inet.c
+builtin_cflags += -DDHCLIENT=\"@DHCLIENT@\"
+else
 plugin_LTLIBRARIES += dhclient.la
-
 dhclient_la_SOURCES = dhclient.c inet.h inet.c
 dhclient_la_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\" \
                -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
 endif
+endif
 
 if PPPD
 plugin_LTLIBRARIES += pppd.la
-
 pppd_la_CFLAGS = $(AM_CFLAGS) -DPPPD=\"@PPPD@\"
 endif
 
 if RESOLVCONF
+if RESOLVCONF_BUILTIN
+builtin_modules += resolvconf
+builtin_sources += resolvconf.c
+builtin_cflags += -DRESOLVCONF=\"@RESOLVCONF@\"
+else
 plugin_LTLIBRARIES += resolvconf.la
-
 resolvconf_la_CFLAGS = $(AM_CFLAGS) -DRESOLVCONF=\"@RESOLVCONF@\"
 endif
+endif
 
 if DNSPROXY
 if DNSPROXY_BUILTIN
@@ -102,7 +131,6 @@ endif
 
 if POLKIT
 plugin_LTLIBRARIES += polkit.la
-
 polkit_la_LIBADD = @POLKIT_LIBS@ @GLIB_LIBS@
 polkit_la_CFLAGS = $(AM_CFLAGS) @POLKIT_CFLAGS@
 
@@ -119,7 +147,6 @@ endif
 
 if IWMXSDK
 plugin_LTLIBRARIES += iwmxsdk.la
-
 iwmxsdk_la_SOURCES = iwmxsdk.c inet.h inet.c
 iwmxsdk_la_LIBADD = @IWMXSDK_LIBS@ @GLIB_LIBS@
 iwmxsdk_la_CFLAGS = $(AM_CFLAGS) @IWMXSDK_CFLAGS@
@@ -129,15 +156,17 @@ if FAKE
 plugin_LTLIBRARIES += fake.la
 endif
 
-noinst_LTLIBRARIES = libbuiltin.la
+noinst_LIBRARIES = libbuiltin.a
 
-libbuiltin_la_SOURCES = $(builtin_sources)
-libbuiltin_la_LDFLAGS =
-libbuiltin_la_CFLAGS = $(AM_CFLAGS) -DCONNMAN_PLUGIN_BUILTIN
+libbuiltin_a_SOURCES = $(builtin_sources)
+libbuiltin_a_LDFLAGS =
+libbuiltin_a_CFLAGS = $(AM_CFLAGS) \
+               $(builtin_cflags) -DCONNMAN_PLUGIN_BUILTIN \
+               -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
 
 BUILT_SOURCES = builtin.h
 
-nodist_libbuiltin_la_SOURCES = $(BUILT_SOURCES)
+nodist_libbuiltin_a_SOURCES = $(BUILT_SOURCES)
 
 AM_LDFLAGS = -no-undefined -module -avoid-version
 
@@ -163,6 +192,7 @@ builtin.h:
        echo "" > $@
        list='$(builtin_modules)'; for i in $$list; \
          do echo "extern struct connman_plugin_desc __connman_builtin_$$i;" >> $@; done
+       echo "" >> $@
        echo "static struct connman_plugin_desc *__connman_builtin[] = {" >> $@
        list='$(builtin_modules)'; for i in $$list; \
          do echo "&__connman_builtin_$$i," >> $@; done