X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=plugins%2FMakefile.am;h=1530c0dd1150ac9050de06b19dc126a04d21d691;hb=7d436d025095baee02c665b15925b8fcf4c4007a;hp=e7376254b9312ae0345f1d3fc6dbcf8751460762;hpb=bc97df35e6b11b4044fe827d859276deaade4a53;p=connman

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e737625..1530c0d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,89 +1,174 @@
 
 plugindir = $(libdir)/connman/plugins
 
-plugin_LTLIBRARIES = ethernet.la bluetooth.la \
-				ipv4.la udhcp.la dhclient.la \
-				dnsproxy.la resolvconf.la resolvfile.la
+plugin_LTLIBRARIES =
+
+builtin_modules =
+builtin_sources =
+builtin_cflags =
 
 if LOOPBACK
+if LOOPBACK_BUILTIN
+builtin_modules += loopback
+builtin_sources += loopback.c
+else
 plugin_LTLIBRARIES += loopback.la
-
-loopback_la_SOURCES = loopback.c
+endif
 endif
 
+if ETHERNET
+if ETHERNET_BUILTIN
+builtin_modules += ethernet
+builtin_sources += ethernet.c inet.h inet.c
+else
+plugin_LTLIBRARIES += ethernet.la
 ethernet_la_SOURCES = ethernet.c inet.h inet.c
+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
 
-ipv4_la_SOURCES = ipv4.c inet.h inet.c
-
+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 = @GLIB_CFLAGS@ @GDBUS_CFLAGS@ -DUDHCPC=\"@UDHCPC@\" \
+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 = @GLIB_CFLAGS@ @GDBUS_CFLAGS@ -DDHCLIENT=\"@DHCLIENT@\" \
+dhclient_la_CFLAGS = $(AM_CFLAGS) -DDHCLIENT=\"@DHCLIENT@\" \
 		-DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
+endif
+endif
 
 if PPPD
 plugin_LTLIBRARIES += pppd.la
-
-pppd_la_SOURCES = pppd.c
+pppd_la_CFLAGS = $(AM_CFLAGS) -DPPPD=\"@PPPD@\"
 endif
 
-dnsproxy_la_SOURCES = dnsproxy.c
-
-resolvconf_la_SOURCES = resolvconf.c
-resolvconf_la_CFLAGS = @GLIB_CFLAGS@ -DRESOLVCONF=\"@RESOLVCONF@\"
+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
 
-resolvfile_la_SOURCES = resolvfile.c
+if DNSPROXY
+if DNSPROXY_BUILTIN
+builtin_modules += dnsproxy
+builtin_sources += dnsproxy.c
+else
+plugin_LTLIBRARIES += dnsproxy.la
+endif
+endif
 
 if POLKIT
 plugin_LTLIBRARIES += polkit.la
-
-polkit_la_SOURCES = polkit.c
 polkit_la_LIBADD = @POLKIT_LIBS@ @GLIB_LIBS@
-polkit_la_CFLAGS = @GLIB_CFLAGS@ @POLKIT_CFLAGS@
+polkit_la_CFLAGS = $(AM_CFLAGS) @POLKIT_CFLAGS@
 
-policydir = $(datadir)/PolicyKit/policy
+if DATAFILES
+policydir = @POLKIT_DATADIR@
 
 policy_DATA = connman.policy
 endif
+endif
+
+if IOSPM
+plugin_LTLIBRARIES += iospm.la
+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@
+endif
 
 if FAKE
 plugin_LTLIBRARIES += fake.la
-
-fake_la_SOURCES = fake.c
 endif
 
-AM_LDFLAGS = -no-undefined -module -avoid-version \
-				-export-symbols-regex connman_plugin_desc
+noinst_LIBRARIES = libbuiltin.a
+
+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_a_SOURCES = $(BUILT_SOURCES)
+
+AM_LDFLAGS = -no-undefined -module -avoid-version
 
 statedir = $(localstatedir)/run/connman
 
@@ -93,10 +178,25 @@ else
 scriptdir = $(libdir)/connman/scripts
 endif
 
-AM_CFLAGS = @GLIB_CFLAGS@ @GDBUS_CFLAGS@
+AM_CFLAGS = -fvisibility=hidden @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
 INCLUDES = -I$(top_builddir)/include
 
-EXTRA_DIST = connman.policy
+CLEANFILES = $(BUILT_SOURCES) connman.policy
+
+EXTRA_DIST = polkit.policy
 
 MAINTAINERCLEANFILES = Makefile.in
+
+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
+	echo "NULL };" >> $@
+
+connman.policy: polkit.policy
+	cp $< $@