Convert to fully non-recursive build system

15 files changed, 423 insertions, 461 deletions

diff --git a/.gitignore b/.gitignore
index 75770316..15aff0a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.la
 .deps
 .libs
+.dirstamp
 Makefile
 Makefile.in
 aclocal.m4
@@ -26,6 +27,7 @@ autom4te.cache
 connman.pc
 include/connman
 include/version.h
+src/builtin.h
 src/connmand
 src/connman.exp
 src/connman.ver
@@ -33,7 +35,6 @@ src/connman.conf
 src/connman.service
 src/*-connman.rules
 plugins/connman.policy
-plugins/builtin.h
 scripts/connman
 scripts/udhcpc-script
 scripts/dhclient-script
diff --git a/Makefile.am b/Makefile.am
index d683d00b..d811c84f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,135 @@
 
-SUBDIRS = gdbus gatchat include plugins src client tools scripts test doc
-
 AM_MAKEFLAGS = --no-print-directory
 
+includedir = @includedir@/connman
+
+include_HEADERS = include/types.h include/log.h include/plugin.h \
+			include/security.h include/notifier.h \
+			include/storage.h include/service.h \
+			include/device.h include/network.h include/inet.h
+
+nodist_include_HEADERS = include/version.h
+
+noinst_HEADERS = include/driver.h include/element.h include/property.h \
+			include/rtnl.h include/wifi.h include/task.h \
+			include/dbus.h include/rfkill.h include/option.h \
+			include/resolver.h include/ipconfig.h \
+			include/profile.h include/provider.h
+
+local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
+			$(noinst_HEADERS), include/connman/$(notdir $(file)))
+
+
+gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/object.c gdbus/watch.c
+
+gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
+				gatchat/gatresult.h gatchat/gatresult.c \
+				gatchat/gatsyntax.h gatchat/gatsyntax.c \
+				gatchat/ringbuffer.h gatchat/ringbuffer.c
+
+if DATAFILES
+dbusdir = @DBUS_DATADIR@
+
+dbus_DATA = src/connman.conf
+endif
+
+plugin_LTLIBRARIES =
+
+plugin_objects =
+
+builtin_modules =
+builtin_sources =
+builtin_libadd =
+builtin_cflags =
+
+noinst_PROGRAMS =
+
+sbin_PROGRAMS = src/connmand
+
+src_connmand_SOURCES = $(gdbus_sources) $(gatchat_sources) $(builtin_sources) \
+			src/main.c src/connman.h src/log.c src/selftest.c \
+			src/error.c src/plugin.c src/task.c src/element.c \
+			src/device.c src/network.c src/connection.c \
+			src/manager.c src/profile.c src/service.c \
+			src/agent.c src/notifier.c src/provider.c \
+			src/security.c src/resolver.c src/ipconfig.c \
+			src/ipv4.c src/storage.c src/rfkill.c src/rtnl.c \
+			src/inet.c src/wifi.c src/dbus.c
+
+if UDEV
+src_connmand_SOURCES += src/udev.c
+else
+src_connmand_SOURCES += src/udev-compat.c
+endif
+
+src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @GTHREAD_LIBS@ \
+						@DBUS_LIBS@ @UDEV_LIBS@ -ldl
+
+src_connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=src/connman.ver
+
+src_connmand_DEPENDENCIES = src/connman.ver
+
+CLEANFILES = src/connman.ver src/connman.exp src/connman.conf \
+						src/builtin.h $(local_headers)
+
+statedir = $(localstatedir)/run/connman
+
+storagedir = $(localstatedir)/lib/connman
+
+plugindir = $(libdir)/connman/plugins
+
+scriptdir = $(libdir)/connman/scripts
+
+AM_CFLAGS = @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @DBUS_CFLAGS@ \
+			@GLIB_CFLAGS@ @GTHREAD_CFLAGS@ $(builtin_cflags) \
+					-DCONNMAN_PLUGIN_BUILTIN \
+					-DSTATEDIR=\""$(statedir)"\" \
+					-DPLUGINDIR=\""$(plugindir)"\" \
+					-DSCRIPTDIR=\""$(scriptdir)"\" \
+					-DSTORAGEDIR=\""$(storagedir)\""
+
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/src \
+				-I$(srcdir)/gdbus -I$(srcdir)/gatchat
+
+EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf
+
+
+script_DATA =
+script_PROGRAMS =
+script_LTLIBRARIES =
+
+include Makefile.plugins
+
+if CLIENT
+noinst_PROGRAMS += client/cm
+
+client_cm_SOURCES = client/main.c
+client_cm_LDADD = @DBUS_LIBS@
+endif
+
+if TOOLS
+noinst_PROGRAMS += tools/wifi-scan tools/addr-test tools/tap-test
+
+tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
+endif
+
+EXTRA_DIST += test/get-state test/list-profiles test/list-services \
+		test/connect-service test/list-connections \
+		test/select-connection test/list-devices test/enable-device \
+		test/disable-device test/start-scanning test/list-networks \
+		test/set-passphrase test/set-address test/test-profile \
+		test/simple-agent test/show-introspection test/test-compat \
+		test/test-manager test/test-connman test/monitor-connman \
+		test/monitor-services test/debug-connman
+
+EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
+				doc/ipconfig-api.txt doc/plugin-api.txt \
+				doc/manager-api.txt doc/agent-api.txt \
+				doc/profile-api.txt doc/service-api.txt \
+				doc/device-lowlevel-api.txt \
+				doc/network-lowlevel-api.txt \
+				doc/connection-lowlevel-api.txt
+
 pkgconfigdir = $(libdir)/pkgconfig
 
 pkgconfig_DATA = connman.pc
@@ -32,3 +159,37 @@ DISTCLEANFILES = $(pkgconfig_DATA)
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
 	ltmain.sh depcomp compile missing install-sh mkinstalldirs
+
+
+src/plugin.$(OBJEXT): src/builtin.h
+
+src/builtin.h: src/genbuiltin $(builtin_sources)
+	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
+
+src/connman.exp: $(src_connmand_OBJECTS)
+	$(AM_V_GEN)nm -B $^ | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@
+
+src/connman.ver: src/connman.exp
+	$(AM_V_at)echo "{ global:" > $@
+	$(AM_V_GEN)cat $< | sed -e "s/\(.*\)/\1;/" >> $@
+	$(AM_V_at)echo "local: *; };" >> $@
+
+src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf
+if POLKIT
+	$(AM_V_GEN)cp $(srcdir)/src/connman-polkit.conf $@
+else
+	$(AM_V_GEN)cp $(srcdir)/src/connman-dbus.conf $@
+endif
+
+$(src_connmand_OBJECTS) $(plugin_objects): $(local_headers)
+
+include/connman/version.h: include/version.h
+	$(AM_V_at)if [ ! -e include/connman ] ; then mkdir include/connman ; fi
+	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
+
+include/connman/%.h: include/%.h
+	$(AM_V_at)if [ ! -e include/connman ] ; then mkdir include/connman ; fi
+	$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+
+clean-local: include/connman
+	@rm -r $<
diff --git a/Makefile.plugins b/Makefile.plugins
new file mode 100644
index 00000000..f1a75330
--- /dev/null
+++ b/Makefile.plugins
@@ -0,0 +1,255 @@
+
+plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
+					@DBUS_CFLAGS@ @GLIB_CFLAGS@
+plugin_ldflags = -no-undefined -module -avoid-version
+
+
+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
+
+if WIFI
+if WIFI_BUILTIN
+builtin_modules += wifi
+builtin_sources += plugins/wifi.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_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 OFONO
+if OFONO_BUILTIN
+builtin_modules += ofono
+builtin_sources += plugins/ofono.c
+else
+plugin_LTLIBRARIES += plugins/ofono.la
+plugin_objects += $(plugins_ofono_la_OBJECTS)
+plugins_ofono_la_CFLAGS = $(plugin_cflags)
+plugins_ofono_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if MODEMMGR
+if MODEMMGR_BUILTIN
+builtin_modules += modemmgr
+builtin_sources += plugins/modemmgr.c
+else
+plugin_LTLIBRARIES += plugins/modemmgr.la
+plugin_objects += $(plugins_modemmgr_la_OBJECTS)
+plugins_modemmgr_la_CFLAGS = $(plugin_cflags)
+plugins_modemmgr_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if NOVATEL
+plugin_LTLIBRARIES += plugins/novatel.la
+plugin_objects += $(plugins_novatel_la_OBJECTS)
+plugins_novatel_la_SOURCES = plugins/novatel.c plugins/modem.h plugins/modem.c
+plugins_novatel_la_CFLAGS = $(plugin_cflags)
+plugins_novatel_la_LDFLAGS = $(plugin_ldflags)
+endif
+
+if HUAWEI
+plugin_LTLIBRARIES += plugins/huawei.la
+plugin_objects += $(plugins_huawei_la_OBJECTS)
+plugins_huawei_la_SOURCES = plugins/huawei.c plugins/modem.h plugins/modem.c
+plugins_huawei_la_CFLAGS = $(plugin_cflags)
+plugins_huawei_la_LDFLAGS = $(plugin_ldflags)
+endif
+
+if HSO
+if HSO_BUILTIN
+builtin_modules += hso
+builtin_sources += plugins/hso.c plugins/modem.h plugins/modem.c
+else
+plugin_LTLIBRARIES += plugins/hso.la
+plugin_objects += $(plugins_hso_la_OBJECTS)
+plugins_hso_la_SOURCES = $(gatchat_sources) \
+			plugins/hso.c plugins/modem.h plugins/modem.c
+plugins_hso_la_CFLAGS = $(plugin_cflags) -I$(srcdir)/gatchat
+plugins_hso_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if MBM
+if MBM_BUILTIN
+builtin_modules += mbm
+builtin_sources += plugins/mbm.c
+else
+plugin_LTLIBRARIES += plugins/mbm.la
+plugin_objects += $(plugins_mbm_la_OBJECTS)
+plugins_mbm_la_SOURCES = $(gatchat_sources) plugins/mbm.c
+plugins_mbm_la_CFLAGS = $(plugin_cflags) -I$(srcdir)/gatchat
+plugins_mbm_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if UDHCP
+if UDHCP_BUILTIN
+builtin_modules += udhcp
+builtin_sources += plugins/udhcp.c plugins/task.h plugins/task.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/task.h plugins/task.c
+plugins_udhcp_la_CFLAGS = $(plugin_cflags) -DUDHCPC=\"@UDHCPC@\" \
+		-DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
+plugins_udhcp_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if DHCLIENT
+if DHCLIENT_BUILTIN
+builtin_modules += dhclient
+builtin_sources += plugins/dhclient.c
+builtin_cflags += -DDHCLIENT=\"@DHCLIENT@\"
+else
+plugin_LTLIBRARIES += plugins/dhclient.la
+plugin_objects += $(plugins_dhclient_la_OBJECTS)
+plugins_dhclient_la_CFLAGS = $(plugin_cflags) -DDHCLIENT=\"@DHCLIENT@\" \
+		-DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
+plugins_dhclient_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+if PPPD
+plugin_LTLIBRARIES += plugins/pppd.la
+plugin_objects += $(plugins_pppd_la_OBJECTS)
+plugins_pppd_la_CFLAGS = $(plugin_cflags) -DPPPD=\"@PPPD@\"
+plugins_pppd_la_LDFLAGS = $(plugin_ldflags)
+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 DNSPROXY
+if DNSPROXY_BUILTIN
+builtin_modules += dnsproxy
+builtin_sources += plugins/dnsproxy.c
+else
+plugin_LTLIBRARIES += plugins/dnsproxy.la
+plugin_objects += $(plugins_dnsproxy_la_OBJECTS)
+plugins_dnsproxy_la_CFLAGS = $(plugin_cflags)
+plugins_dnsproxy_la_LDFLAGS = $(plugin_ldflags)
+endif
+endif
+
+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_LDFLAGS = $(plugin_ldflags)
+endif
+
+if DATAFILES
+policydir = @POLKIT_DATADIR@
+
+policy_DATA = plugins/connman.policy
+endif
+endif
+
+if IWMX
+plugin_LTLIBRARIES += plugins/iwmxsdk.la
+plugin_objects += $(plugins_iwmxsdk_la_OBJECTS)
+plugins_iwmxsdk_la_SOURCES = plugins/iwmx.h plugins/iwmx.c plugins/iwmxsdk.c
+plugins_iwmxsdk_la_CFLAGS = $(plugin_cflags) @IWMXSDK_CFLAGS@
+plugins_iwmxsdk_la_LIBADD = @IWMXSDK_LIBS@ @GLIB_LIBS@
+plugins_iwmxsdk_la_LDFLAGS = $(plugin_ldflags)
+endif
+
+if IOSPM
+plugin_LTLIBRARIES += plugins/iospm.la
+plugin_objects += $(plugins_iospm_la_OBJECTS)
+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 UDHCP
+script_PROGRAMS += scripts/udhcpc-script
+
+scripts_udhcpc_script_LDADD = @DBUS_LIBS@
+endif
+
+if DHCLIENT
+script_DATA += scripts/dhclient.conf
+script_PROGRAMS += scripts/dhclient-script
+
+scripts_dhclient_script_LDADD = @DBUS_LIBS@
+endif
+
+if PPPD
+script_LTLIBRARIES += scripts/pppd-plugin.la
+
+scripts_pppd_plugin_la_LDFLAGS = -module -avoid-version
+endif
+
+
+EXTRA_DIST += plugins/polkit.policy scripts/dhclient.conf
+
+plugins/connman.policy: plugins/polkit.policy
+if POLKIT
+	$(AM_V_GEN)cp $< $@
+endif
diff --git a/client/Makefile.am b/client/Makefile.am
deleted file mode 100644
index 4dc16084..00000000
--- a/client/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-if CLIENT
-noinst_PROGRAMS = cm
-
-cm_SOURCES = main.c
-
-cm_LDADD = @DBUS_LIBS@
-endif
-
-AM_CFLAGS = @DBUS_CFLAGS@
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/configure.ac b/configure.ac
index 04e45acb..f0883528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT(connman, 0.38)
 
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -327,10 +327,5 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
 					[enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 
-AC_OUTPUT(Makefile gdbus/Makefile gatchat/Makefile
-				include/Makefile include/version.h
-				src/Makefile src/connman.service
-				scripts/connman scripts/Makefile
-				plugins/Makefile client/Makefile
-				tools/Makefile test/Makefile
-				doc/Makefile doc/version.xml connman.pc)
+AC_OUTPUT(Makefile include/version.h src/connman.service
+				scripts/connman doc/version.xml connman.pc)
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 16b0fb17..00000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-
-DOC_MODULE = connman
-
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
-
-DOC_SOURCE_DIR = ../src
-
-SCAN_OPTIONS = --rebuild-sections --source-dir=../include
-
-MKDB_OPTIONS = --sgml-mode --output-format=xml --tmpl-dir=. \
-						--ignore-files=connman \
-						--source-dir=../include \
-						--source-suffixes=c,h
-
-MKTMPL_OPTIONS = --output-dir=.
-
-HFILE_GLOB = $(top_srcdir)/include/*.h
-CFILE_GLOB = $(top_srcdir)/src/*.c $(top_srcdir)/src/*.h
-
-IGNORE_HFILES = connman connman.h
-
-HTML_IMAGES =
-
-content_files = connman-introduction.xml
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/gdbus \
-	$(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-
-GTKDOC_LIBS = $(DBUS_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS)
-
-MAINTAINERCLEANFILES = Makefile.in \
-	$(DOC_MODULE).types $(DOC_MODULE)-*.txt *.sgml *.bak
-
-if ENABLE_GTK_DOC
-include $(top_srcdir)/doc/gtk-doc.make
-else
-EXTRA_DIST = $(DOC_MAIN_SGML_FILE) connman-introduction.xml
-endif
-
-EXTRA_DIST += overview-api.txt behavior-api.txt \
-				ipconfig-api.txt plugin-api.txt \
-				manager-api.txt agent-api.txt \
-				profile-api.txt service-api.txt \
-				device-lowlevel-api.txt \
-				network-lowlevel-api.txt \
-				connection-lowlevel-api.txt
diff --git a/gatchat/Makefile.am b/gatchat/Makefile.am
deleted file mode 100644
index 8b2ed200..00000000
--- a/gatchat/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-noinst_LTLIBRARIES = libgatchat.la
-
-libgatchat_la_SOURCES = gatchat.h gatchat.c gatresult.h gatresult.c \
-			ringbuffer.h ringbuffer.c gatsyntax.h gatsyntax.c
-
-AM_CFLAGS = @GLIB_CFLAGS@
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/gdbus/Makefile.am b/gdbus/Makefile.am
deleted file mode 100644
index 9447555f..00000000
--- a/gdbus/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-noinst_LTLIBRARIES = libgdbus.la
-
-libgdbus_la_SOURCES = gdbus.h mainloop.c object.c watch.c
-
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index ea364d36..00000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-includedir = @includedir@/connman
-
-include_HEADERS = types.h log.h plugin.h security.h notifier.h \
-				storage.h device.h network.h inet.h
-
-nodist_include_HEADERS = version.h
-
-noinst_HEADERS = driver.h element.h property.h rtnl.h wifi.h task.h \
-			dbus.h rfkill.h option.h resolver.h ipconfig.h \
-					profile.h service.h provider.h
-
-MAINTAINERCLEANFILES = Makefile.in
-
-all-local:
-	@if [ ! -e connman ]; then \
-	  mkdir connman; \
-	  list='$(include_HEADERS) $(noinst_HEADERS)'; for i in $$list; \
-	    do $(LN_S) $(abs_top_srcdir)/include/$$i connman/$$i; done; \
-	  list='$(nodist_include_HEADERS)'; for i in $$list; \
-	    do $(LN_S) $(abs_top_builddir)/include/$$i connman/$$i; done; \
-	fi
-
-clean-local:
-	@rm -rf connman
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
deleted file mode 100644
index 8c5af9fa..00000000
--- a/plugins/Makefile.am
+++ /dev/null
@@ -1,229 +0,0 @@
-
-plugindir = $(libdir)/connman/plugins
-
-plugin_LTLIBRARIES =
-
-builtin_modules =
-builtin_sources =
-builtin_libadd =
-builtin_cflags =
-
-if LOOPBACK
-if LOOPBACK_BUILTIN
-builtin_modules += loopback
-builtin_sources += loopback.c
-else
-plugin_LTLIBRARIES += loopback.la
-endif
-endif
-
-if ETHERNET
-if ETHERNET_BUILTIN
-builtin_modules += ethernet
-builtin_sources += ethernet.c
-else
-plugin_LTLIBRARIES += ethernet.la
-endif
-endif
-
-if WIFI
-if WIFI_BUILTIN
-builtin_modules += wifi
-builtin_sources += wifi.c supplicant.h supplicant.c
-else
-plugin_LTLIBRARIES += wifi.la
-wifi_la_SOURCES = wifi.c supplicant.h supplicant.c
-wifi_la_LIBADD = @GDBUS_LIBS@
-endif
-endif
-
-if BLUETOOTH
-if BLUETOOTH_BUILTIN
-builtin_modules += bluetooth
-builtin_sources += bluetooth.c
-else
-plugin_LTLIBRARIES += bluetooth.la
-bluetooth_la_LIBADD = @GDBUS_LIBS@
-endif
-endif
-
-if OFONO
-if OFONO_BUILTIN
-builtin_modules += ofono
-builtin_sources += ofono.c
-else
-plugin_LTLIBRARIES += ofono.la
-ofono_la_LIBADD = @GDBUS_LIBS@
-endif
-endif
-
-if MODEMMGR
-if MODEMMGR_BUILTIN
-builtin_modules += modemmgr
-builtin_sources += modemmgr.c
-else
-plugin_LTLIBRARIES += modemmgr.la
-modemmgr_la_LIBADD = @GDBUS_LIBS@
-endif
-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
-if HSO_BUILTIN
-builtin_modules += hso
-builtin_sources += hso.c modem.h modem.c
-builtin_libadd += @GATCHAT_LIBS@
-builtin_cflags += @GATCHAT_CFLAGS@
-else
-plugin_LTLIBRARIES += hso.la
-hso_la_SOURCES = hso.c modem.h modem.c
-hso_la_LIBADD = @GATCHAT_LIBS@
-hso_la_CFLAGS = $(AM_CFLAGS) @GATCHAT_CFLAGS@
-endif
-endif
-
-if MBM
-if MBM_BUILTIN
-builtin_modules += mbm
-builtin_sources += mbm.c
-builtin_libadd += @GATCHAT_LIBS@
-builtin_cflags += @GATCHAT_CFLAGS@
-else
-plugin_LTLIBRARIES += mbm.la
-mbm_la_LIBADD = @GATCHAT_LIBS@
-mbm_la_CFLAGS = $(AM_CFLAGS) @GATCHAT_CFLAGS@
-endif
-endif
-
-if UDHCP
-if UDHCP_BUILTIN
-builtin_modules += udhcp
-builtin_sources += udhcp.c task.h task.c
-builtin_cflags += -DUDHCPC=\"@UDHCPC@\"
-else
-plugin_LTLIBRARIES += udhcp.la
-udhcp_la_SOURCES = udhcp.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
-builtin_cflags += -DDHCLIENT=\"@DHCLIENT@\"
-else
-plugin_LTLIBRARIES += dhclient.la
-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
-builtin_modules += dnsproxy
-builtin_sources += dnsproxy.c
-else
-plugin_LTLIBRARIES += dnsproxy.la
-endif
-endif
-
-if POLKIT
-if POLKIT_BUILTIN
-builtin_modules += polkit
-builtin_sources += polkit.c
-builtin_libadd += @POLKIT_LIBS@
-builtin_cflags += @POLKIT_CFLAGS@
-else
-plugin_LTLIBRARIES += polkit.la
-polkit_la_LIBADD = @POLKIT_LIBS@ @GLIB_LIBS@
-polkit_la_CFLAGS = $(AM_CFLAGS) @POLKIT_CFLAGS@
-endif
-
-if DATAFILES
-policydir = @POLKIT_DATADIR@
-
-policy_DATA = connman.policy
-endif
-endif
-
-if IWMX
-plugin_LTLIBRARIES += iwmxsdk.la
-iwmxsdk_la_SOURCES = iwmx.h iwmx.c iwmxsdk.c
-iwmxsdk_la_LIBADD = @IWMXSDK_LIBS@ @GLIB_LIBS@
-iwmxsdk_la_CFLAGS = $(AM_CFLAGS) @IWMXSDK_CFLAGS@
-endif
-
-if IOSPM
-plugin_LTLIBRARIES += iospm.la
-endif
-
-if FAKE
-plugin_LTLIBRARIES += fake.la
-endif
-
-noinst_LTLIBRARIES = libbuiltin.la
-
-libbuiltin_la_SOURCES = $(builtin_sources)
-libbuiltin_la_LIBADD = $(builtin_libadd)
-libbuiltin_la_CFLAGS = $(AM_CFLAGS) \
-		$(builtin_cflags) -DCONNMAN_PLUGIN_BUILTIN \
-		-DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
-
-BUILT_SOURCES = builtin.h
-
-nodist_libbuiltin_la_SOURCES = $(BUILT_SOURCES)
-
-AM_LDFLAGS = -no-undefined -module -avoid-version
-
-statedir = $(localstatedir)/run/connman
-
-if MAINTAINER_MODE
-scriptdir = $(abs_top_srcdir)/scripts
-else
-scriptdir = $(libdir)/connman/scripts
-endif
-
-AM_CFLAGS = -fvisibility=hidden @GLIB_CFLAGS@ @GDBUS_CFLAGS@
-
-INCLUDES = -I$(top_builddir)/include
-
-CLEANFILES = $(BUILT_SOURCES) connman.policy
-
-EXTRA_DIST = polkit.policy genbuiltin
-
-MAINTAINERCLEANFILES = Makefile.in
-
-builtin.h: genbuiltin $(builtin_sources)
-	$(AM_V_GEN)$(srcdir)/genbuiltin $(builtin_modules) > $@
-
-connman.policy: polkit.policy
-if POLKIT
-	$(AM_V_GEN)cp $< $@
-endif
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index a0c63633..00000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-
-initdir = $(sysconfdir)/init.d
-
-init_SCRIPTS = connman
-
-DISTCLEANFILES = $(init_SCRIPTS)
-
-scriptdir = $(libdir)/connman/scripts
-
-script_DATA =
-script_PROGRAMS =
-script_LTLIBRARIES =
-
-if UDHCP
-script_PROGRAMS += udhcpc-script
-
-udhcpc_script_LDADD = @DBUS_LIBS@
-endif
-
-if DHCLIENT
-script_DATA += dhclient.conf
-script_PROGRAMS += dhclient-script
-
-dhclient_script_LDADD = @DBUS_LIBS@
-endif
-
-if PPPD
-script_LTLIBRARIES += pppd-plugin.la
-
-pppd_plugin_la_LDFLAGS = -module -avoid-version
-endif
-
-AM_CFLAGS = @DBUS_CFLAGS@
-
-EXTRA_DIST = dhclient.conf
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 4b997977..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-
-if DATAFILES
-dbusdir = @DBUS_DATADIR@
-
-dbus_DATA = connman.conf
-endif
-
-sbin_PROGRAMS = connmand
-
-connmand_SOURCES = main.c connman.h log.c selftest.c error.c plugin.c \
-			task.c element.c device.c network.c connection.c \
-			manager.c profile.c service.c agent.c notifier.c \
-			provider.c security.c resolver.c ipconfig.c ipv4.c \
-			storage.c rfkill.c rtnl.c inet.c wifi.c dbus.c
-
-if UDEV
-connmand_SOURCES += udev.c
-else
-connmand_SOURCES += udev-compat.c
-endif
-
-connmand_LDADD = $(top_builddir)/plugins/libbuiltin.la \
-		@GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ @UDEV_LIBS@ -ldl
-
-connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=connman.ver
-
-connmand_DEPENDENCIES = connman.ver $(top_builddir)/plugins/libbuiltin.la
-
-CLEANFILES = connman.ver connman.exp connman.conf
-
-statedir = $(localstatedir)/run/connman
-
-storagedir = $(localstatedir)/lib/connman
-
-if MAINTAINER_MODE
-plugindir = $(abs_top_srcdir)/plugins/.libs
-else
-plugindir = $(libdir)/connman/plugins
-endif
-
-AM_CFLAGS = @UDEV_CFLAGS@ @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
-					-DSTATEDIR=\""$(statedir)"\" \
-					-DPLUGINDIR=\""$(plugindir)"\" \
-					-DSTORAGEDIR=\""$(storagedir)\""
-
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/plugins
-
-EXTRA_DIST = connman-dbus.conf connman-polkit.conf
-
-MAINTAINERCLEANFILES = Makefile.in
-
-connman.exp: $(connmand_OBJECTS)
-	$(AM_V_GEN)nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@
-
-connman.ver: connman.exp
-	$(AM_V_at)echo "{ global:" > $@
-	$(AM_V_GEN)cat $< | sed -e "s/\(.*\)/\1;/" >> $@
-	$(AM_V_at)echo "local: *; };" >> $@
-
-connman.conf: connman-dbus.conf connman-polkit.conf
-if POLKIT
-	$(AM_V_GEN)cp $(top_srcdir)/src/connman-polkit.conf $@
-else
-	$(AM_V_GEN)cp $(top_srcdir)/src/connman-dbus.conf $@
-endif
diff --git a/plugins/genbuiltin b/src/genbuiltin
index 3e1bb0cc..3e1bb0cc 100755
--- a/plugins/genbuiltin
+++ b/src/genbuiltin
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 1840a01b..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-EXTRA_DIST = get-state list-profiles list-services connect-service \
-		list-connections select-connection \
-		list-devices enable-device disable-device start-scanning \
-		list-networks set-passphrase set-address test-profile \
-		simple-agent show-introspection test-compat test-manager \
-		test-connman monitor-connman monitor-services debug-connman
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 24c8c9ed..00000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-if TOOLS
-noinst_PROGRAMS = wifi-scan addr-test tap-test
-
-wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
-endif
-
-AM_CFLAGS = @NETLINK_CFLAGS@ @GLIB_CFLAGS@
-
-MAINTAINERCLEANFILES = Makefile.in