Switch to a full non-recursive build system

41 files changed, 514 insertions, 768 deletions

diff --git a/.gitignore b/.gitignore
index 9ee703d6..0f3c53d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.so
 .deps
 .libs
+.dirstamp
 Makefile
 Makefile.in
 aclocal.m4
@@ -67,6 +68,7 @@ test/avtest
 test/l2test
 test/rctest
 test/scotest
+test/gaptest
 test/sdptest
 test/lmptest
 test/btiotest
diff --git a/Makefile.am b/Makefile.am
index 4ee6695d..9c9cfc84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,274 @@
 
-SUBDIRS = include lib sbc gdbus common \
-		plugins network serial input audio src \
-		client tools rfcomm compat cups test scripts doc
-
 AM_MAKEFLAGS = --no-print-directory
 
+lib_LTLIBRARIES =
+
+noinst_LTLIBRARIES =
+
+bin_PROGRAMS =
+
+sbin_PROGRAMS =
+
+noinst_PROGRAMS =
+
+dist_man_MANS =
+
+dist_noinst_MANS =
+
+CLEANFILES =
+
+EXTRA_DIST =
+
+includedir = @includedir@/bluetooth
+
+include_HEADERS =
+
+confdir = $(sysconfdir)/bluetooth
+
+conf_DATA =
+
+plugindir = $(libdir)/bluetooth/plugins
+
+plugin_LTLIBRARIES =
+
+
+lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h \
+			lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h \
+				lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h
+local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file)))
+
+include_HEADERS += $(lib_headers)
+
+lib_LTLIBRARIES += lib/libbluetooth.la
+
+lib_libbluetooth_la_SOURCES = $(lib_headers) \
+					lib/bluetooth.c lib/hci.c lib/sdp.c
+lib_libbluetooth_la_LDFLAGS = -version-info 6:0:3
+lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
+
+CLEANFILES += $(local_headers)
+
+
+if SBC
+noinst_LTLIBRARIES += sbc/libsbc.la
+
+sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sbc.c sbc/sbc_math.h sbc/sbc_tables.h \
+			sbc/sbc_primitives.h sbc/sbc_primitives.c \
+			sbc/sbc_primitives_mmx.h sbc/sbc_primitives_mmx.c \
+			sbc/sbc_primitives_neon.h sbc/sbc_primitives_neon.c
+
+sbc_libsbc_la_CFLAGS = -finline-functions -fgcse-after-reload \
+					-funswitch-loops -funroll-loops
+
+noinst_PROGRAMS += sbc/sbcinfo sbc/sbcdec sbc/sbcenc
+
+sbc_sbcdec_SOURCES = sbc/sbcdec.c sbc/formats.h
+sbc_sbcdec_LDADD = sbc/libsbc.la
+
+sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
+sbc_sbcenc_LDADD = sbc/libsbc.la
+
+if SNDFILE
+noinst_PROGRAMS += sbc/sbctester
+
+sbc_sbctester_LDADD = @SNDFILE_LIBS@
+sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@
+endif
+endif
+
+
+if NETLINK
+plugin_LTLIBRARIES += plugins/netlink.la
+
+plugins_netlink_la_LIBADD = @NETLINK_LIBS@
+plugins_netlink_la_LDFLAGS = -module -avoid-version -no-undefined
+plugins_netlink_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
+					@GLIB_CFLAGS@ @NETLINK_CFLAGS@
+endif
+
+gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/object.c gdbus/watch.c
+
+builtin_modules =
+builtin_sources =
+builtin_nodist =
+
+if ECHOPLUGIN
+builtin_modules += echo
+builtin_sources += plugins/echo.c
+endif
+
+if AUDIOPLUGIN
+builtin_modules += audio
+builtin_sources += audio/main.c \
+			audio/manager.h audio/manager.c \
+			audio/gateway.h audio/gateway.c \
+			audio/headset.h audio/headset.c \
+			audio/control.h audio/control.c \
+			audio/device.h audio/device.c \
+			audio/source.h audio/source.c \
+			audio/sink.h audio/sink.c \
+			audio/a2dp.h audio/a2dp.c \
+			audio/avdtp.h audio/avdtp.c \
+			audio/ipc.h audio/ipc.c \
+			audio/unix.h audio/unix.c \
+			audio/telephony.h
+builtin_nodist += audio/telephony.c
+endif
+
+if INPUTPLUGIN
+builtin_modules += input
+builtin_sources += input/main.c \
+			input/manager.h input/manager.c \
+			input/server.h input/server.c \
+			input/device.h input/device.c \
+			input/fakehid.c input/fakehid.h
+endif
+
+if SERIALPLUGIN
+builtin_modules += serial
+builtin_sources += serial/main.c \
+			serial/manager.h serial/manager.c \
+			serial/proxy.h serial/proxy.c \
+			serial/port.h serial/port.c
+endif
+
+if NETWORKPLUGIN
+builtin_modules += network
+builtin_sources += network/main.c \
+			network/manager.h network/manager.c \
+			network/common.h network/common.c \
+			network/server.h network/server.c \
+			network/bridge.h network/bridge.c \
+			network/connection.h network/connection.c
+endif
+
+if SERVICEPLUGIN
+builtin_modules += service
+builtin_sources += plugins/service.c
+endif
+
+builtin_modules += hciops
+builtin_sources += plugins/hciops.c
+
+builtin_modules += hal
+builtin_sources += plugins/hal.c
+
+builtin_modules += storage
+builtin_sources += plugins/storage.c
+
+sbin_PROGRAMS += src/bluetoothd
+
+src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+			common/uinput.h common/ppoll.h \
+			common/glib-helper.h common/glib-helper.c \
+			common/btio.h common/btio.c \
+			common/oui.h common/oui.c \
+			common/textfile.h common/textfile.c \
+			common/sdp-xml.h common/sdp-xml.c \
+			src/main.c src/logging.h src/logging.c \
+			src/security.c src/rfkill.c src/hcid.h src/sdpd.h \
+			src/sdpd-server.c src/sdpd-request.c \
+			src/sdpd-service.c src/sdpd-database.c \
+			src/plugin.h src/plugin.c \
+			src/storage.h src/storage.c \
+			src/agent.h src/agent.c \
+			src/error.h src/error.c \
+			src/manager.h src/manager.c \
+			src/adapter.h src/adapter.c \
+			src/device.h src/device.c \
+			src/dbus-common.c src/dbus-common.h \
+			src/dbus-hci.h src/dbus-hci.c
+src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ -ldl
+src_bluetoothd_LDFLAGS = -Wl,--export-dynamic
+
+builtin_files = src/builtin.h $(builtin_nodist)
+
+nodist_src_bluetoothd_SOURCES = $(builtin_files)
+
+CLEANFILES += $(builtin_files)
+
+man_MANS = src/bluetoothd.8
+
+if CONFIGFILES
+conf_DATA += src/main.conf
+endif
+
+EXTRA_DIST += src/genbuiltin src/main.conf audio/telephony-dummy.c \
+			audio/telephony-maemo.c audio/telephony-ofono.c
+
+
+include Makefile.audio
+include Makefile.tools
+
+if UDEVRULES
+rulesdir = @UDEV_DATADIR@
+
+udev_files = scripts/bluetooth.rules
+
+if HID2HCI
+udev_files += scripts/bluetooth-hid2hci.rules
+endif
+
+if PCMCIA
+udev_files += scripts/bluetooth-serial.rules
+endif
+
+rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file)))
+endif
+
+CLEANFILES += $(rules_DATA)
+
+EXTRA_DIST += scripts/bluetooth.rules \
+		scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
+
+if PCMCIA
+udevdir = $(libexecdir)/udev
+
+dist_udev_SCRIPTS = scripts/bluetooth_serial
+endif
+
+EXTRA_DIST += doc/manager-api.txt \
+		doc/adapter-api.txt doc/device-api.txt \
+		doc/service-api.txt doc/agent-api.txt \
+		doc/serial-api.txt doc/network-api.txt \
+		doc/input-api.txt doc/audio-api.txt doc/control-api.txt
+
+AM_YFLAGS = -d
+
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
+		-DBLUETOOTH_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\"
+
+INCLUDES = -I$(builddir)/lib \
+			-I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/common \
+			-I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus
+
+
 pkgconfigdir = $(libdir)/pkgconfig
 
 pkgconfig_DATA = bluez.pc
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc --disable-udevrules
+DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
 	ltmain.sh depcomp compile missing install-sh mkinstalldirs ylwrap
+
+src/plugin.$(OBJEXT): src/builtin.h
+
+src/builtin.h: src/genbuiltin $(builtin_sources)
+	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
+
+audio/telephony.c: audio/@TELEPHONY_DRIVER@
+	$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+
+scripts/%.rules:
+	$(AM_V_GEN)cp $(subst 97-,,$@) $@
+
+lib/bluetooth/%.h: lib/%.h
+	$(AM_V_at)if [ ! -e lib/bluetooth ] ; then mkdir lib/bluetooth ; fi
+	$(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+
+clean-local: lib/bluetooth
+	@rm -r $<
diff --git a/Makefile.audio b/Makefile.audio
new file mode 100644
index 00000000..18f84841
--- /dev/null
+++ b/Makefile.audio
@@ -0,0 +1,56 @@
+
+if AUDIOPLUGIN
+if ALSA
+alsadir = $(libdir)/alsa-lib
+
+alsa_LTLIBRARIES = audio/libasound_module_pcm_bluetooth.la \
+				audio/libasound_module_ctl_bluetooth.la
+
+audio_libasound_module_pcm_bluetooth_la_SOURCES = audio/pcm_bluetooth.c \
+					audio/rtp.h audio/ipc.h audio/ipc.c
+audio_libasound_module_pcm_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_pcm_.*
+audio_libasound_module_pcm_bluetooth_la_LIBADD = sbc/libsbc.la \
+						lib/libbluetooth.la @ALSA_LIBS@
+audio_libasound_module_pcm_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
+
+audio_libasound_module_ctl_bluetooth_la_SOURCES = audio/ctl_bluetooth.c \
+					audio/rtp.h audio/ipc.h audio/ipc.c
+audio_libasound_module_ctl_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_ctl_.*
+audio_libasound_module_ctl_bluetooth_la_LIBADD = lib/libbluetooth.la @ALSA_LIBS@
+audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
+
+if CONFIGFILES
+alsaconfdir = $(sysconfdir)/alsa
+
+alsaconf_DATA = audio/bluetooth.conf
+endif
+endif
+
+if GSTREAMER
+gstreamerdir = $(libdir)/gstreamer-0.10
+
+gstreamer_LTLIBRARIES = audio/libgstbluetooth.la
+
+audio_libgstbluetooth_la_SOURCES = audio/gstbluetooth.c \
+				audio/gstsbcenc.h audio/gstsbcenc.c \
+				audio/gstsbcdec.h audio/gstsbcdec.c \
+				audio/gstsbcparse.h audio/gstsbcparse.c \
+				audio/gstavdtpsink.h audio/gstavdtpsink.c \
+				audio/gsta2dpsink.h audio/gsta2dpsink.c \
+				audio/gstsbcutil.h audio/gstsbcutil.c \
+				audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c \
+				audio/rtp.h audio/ipc.h audio/ipc.c
+audio_libgstbluetooth_la_LDFLAGS = -module -avoid-version
+audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth.la \
+				@GSTREAMER_LIBS@ -lgstaudio-0.10 -lgstrtp-0.10
+audio_libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \
+						$(AM_CFLAGS) @GSTREAMER_CFLAGS@
+endif
+
+noinst_PROGRAMS += audio/ipctest
+
+audio_ipctest_SOURCES = audio/ipctest.c audio/ipc.h audio/ipc.c
+audio_ipctest_LDADD= sbc/libsbc.la @GLIB_LIBS@
+endif
+
+EXTRA_DIST += audio/bluetooth.conf
diff --git a/Makefile.tools b/Makefile.tools
new file mode 100644
index 00000000..aff6bed2
--- /dev/null
+++ b/Makefile.tools
@@ -0,0 +1,161 @@
+
+if TOOLS
+if CONFIGFILES
+conf_DATA += rfcomm/rfcomm.conf
+endif
+
+bin_PROGRAMS += rfcomm/rfcomm tools/l2ping \
+				tools/hcitool tools/sdptool tools/ciptool
+
+noinst_PROGRAMS += tools/avinfo tools/ppporc \
+				tools/hcieventmask tools/hcisecfilter
+
+rfcomm_rfcomm_SOURCES = rfcomm/main.c rfcomm/parser.y rfcomm/lexer.l \
+					rfcomm/kword.h rfcomm/kword.c
+EXTRA_rfcomm_rfcomm_SOURCES = rfcomm/parser.h rfcomm/parser.c \
+							rfcomm/lexer.c
+rfcomm_rfcomm_LDADD = lib/libbluetooth.la
+
+tools_l2ping_LDADD = lib/libbluetooth.la
+
+tools_hcitool_SOURCES = tools/hcitool.c \
+				common/textfile.h common/textfile.c \
+						common/oui.h common/oui.c
+tools_hcitool_LDADD = lib/libbluetooth.la
+
+tools_sdptool_SOURCES = tools/sdptool.c common/sdp-xml.h common/sdp-xml.c
+tools_sdptool_LDADD = lib/libbluetooth.la
+
+tools_ciptool_LDADD = lib/libbluetooth.la
+
+tools_avinfo_LDADD = lib/libbluetooth.la
+
+tools_ppporc_LDADD = lib/libbluetooth.la
+
+tools_hcieventmask_LDADD = lib/libbluetooth.la
+
+dist_man_MANS += rfcomm/rfcomm.1 tools/l2ping.8 \
+			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
+endif
+
+CLEANFILES += rfcomm/lexer.c rfcomm/parser.c rfcomm/parser.h
+
+EXTRA_DIST += rfcomm/rfcomm.conf
+
+
+if DFUTOOL
+bin_PROGRAMS += tools/dfutool
+
+tools_dfutool_SOURCES = tools/dfutool.c tools/dfu.h tools/dfu.c
+tools_dfutool_LDADD = @USB_LIBS@
+
+dist_man_MANS += tools/dfutool.1
+endif
+
+
+if USB
+noinst_PROGRAMS += tools/dfubabel tools/avctrl
+
+tools_dfubabel_LDADD = @USB_LIBS@
+
+tools_avctrl_LDADD = @USB_LIBS@
+
+dist_man_MANS += tools/dfubabel.1 tools/avctrl.8
+endif
+
+
+if CUPS
+cupsdir = $(libdir)/cups/backend
+
+cups_PROGRAMS = cups/bluetooth
+
+cups_bluetooth_SOURCES = $(gdbus_sources) cups/main.c cups/cups.h \
+					cups/sdp.c cups/spp.c cups/hcrp.c
+
+cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ lib/libbluetooth.la
+endif
+
+
+if TEST
+sbin_PROGRAMS += test/hciemu
+
+bin_PROGRAMS += test/l2test test/rctest
+
+noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \
+			test/attest test/hstest test/avtest test/lmptest \
+					test/bdaddr test/agent test/btiotest
+
+test_hciemu_LDADD = @GLIB_LIBS@ lib/libbluetooth.la
+
+test_l2test_LDADD = lib/libbluetooth.la
+
+test_rctest_LDADD = lib/libbluetooth.la
+
+test_gaptest_LDADD = @DBUS_LIBS@
+
+test_sdptest_LDADD = lib/libbluetooth.la
+
+test_scotest_LDADD = lib/libbluetooth.la
+
+test_attest_LDADD = lib/libbluetooth.la
+
+test_hstest_LDADD = lib/libbluetooth.la
+
+test_avtest_LDADD = lib/libbluetooth.la
+
+test_bdaddr_SOURCES = test/bdaddr.c common/oui.h common/oui.c
+test_bdaddr_LDADD = lib/libbluetooth.la
+
+test_lmptest_LDADD = lib/libbluetooth.la
+
+test_agent_LDADD = @DBUS_LIBS@
+
+test_btiotest_SOURCES = test/btiotest.c common/btio.h common/btio.c
+test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth.la
+
+dist_man_MANS += test/rctest.1 test/hciemu.1
+
+dist_noinst_MANS += test/bdaddr.8
+endif
+
+EXTRA_DIST += test/apitest test/hsplay test/hsmicro test/dbusdef.py \
+		test/monitor-bluetooth test/list-devices test/test-discovery \
+		test/test-manager test/test-adapter test/test-device \
+		test/test-service test/test-serial test/test-telephony \
+		test/test-network test/simple-agent test/simple-service \
+		test/service-record.dtd test/service-did.xml \
+		test/service-spp.xml test/service-opp.xml test/service-ftp.xml
+
+
+if HIDD
+bin_PROGRAMS += compat/hidd
+
+compat_hidd_SOURCES = compat/hidd.c compat/hidd.h \
+				compat/sdp.h compat/sdp.c compat/fakehid.c \
+					common/textfile.h common/textfile.c
+compat_hidd_LDADD = -lm lib/libbluetooth.la
+
+dist_man_MANS += compat/hidd.1
+endif
+
+if PAND
+bin_PROGRAMS += compat/pand
+
+compat_pand_SOURCES = compat/pand.c compat/pand.h \
+				compat/bnep.c compat/sdp.h compat/sdp.c \
+					common/textfile.h common/textfile.c
+compat_pand_LDADD = lib/libbluetooth.la
+
+dist_man_MANS += compat/pand.1
+endif
+
+if DUND
+bin_PROGRAMS += compat/dund
+
+compat_dund_SOURCES = compat/dund.c compat/dund.h compat/lib.h \
+			compat/sdp.h compat/sdp.c compat/dun.c compat/msdun.c \
+					common/textfile.h common/textfile.c
+compat_dund_LDADD = lib/libbluetooth.la
+
+dist_man_MANS += compat/dund.1
+endif
diff --git a/acinclude.m4 b/acinclude.m4
index 248fed33..44f7c72b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -25,34 +25,6 @@ AC_DEFUN([COMPILER_FLAGS], [
 	fi
 ])
 
-AC_DEFUN([GTK_DOC_CHECK], [
-	AC_ARG_WITH([html-dir],
-		AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-					[with_html_dir='${datadir}/gtk-doc/html'])
-	HTML_DIR="$with_html_dir"
-	AC_SUBST([HTML_DIR])
-
-	AC_ARG_ENABLE([gtk-doc],
-		AS_HELP_STRING([--enable-gtk-doc], [use gtk-doc to build documentation [[default=no]]]),,
-					[enable_gtk_doc=no])
-
-	if test x$enable_gtk_doc = xyes; then
-		ifelse([$1],[],
-			[PKG_CHECK_EXISTS([gtk-doc],,
-				AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-			[PKG_CHECK_EXISTS([gtk-doc >= $1],,
-				AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
-	fi
-
-	AC_MSG_CHECKING([whether to build gtk-doc documentation])
-	AC_MSG_RESULT($enable_gtk_doc)
-
-	AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
-
-	AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-	AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-])
-
 AC_DEFUN([AC_FUNC_PPOLL], [
 	AC_CHECK_FUNC(ppoll, dummy=yes, AC_DEFINE(NEED_PPOLL, 1,
 			[Define to 1 if you need the ppoll() function.]))
@@ -208,7 +180,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	pcmcia_enable=no
 	hid2hci_enable=no
 	dfutool_enable=no
-	manpages_enable=yes
 	udevrules_enable=yes
 	configfiles_enable=yes
 	telephony_driver=dummy
@@ -301,10 +272,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 		test_enable=${enableval}
 	])
 
-	AC_ARG_ENABLE(manpages, AC_HELP_STRING([--enable-manpages], [install Bluetooth manual pages]), [
-		manpages_enable=${enableval}
-	])
-
 	AC_ARG_ENABLE(udevrules, AC_HELP_STRING([--enable-udevrules], [install Bluetooth udev rules]), [
 		udevrules_enable=${enableval}
 	])
@@ -344,15 +311,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 		AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
 	fi
 
-	AC_SUBST([BLUEZ_CFLAGS], ['-I$(top_builddir)/include'])
-	AC_SUBST([BLUEZ_LIBS], ['$(top_builddir)/lib/libbluetooth.la'])
-
-	AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus'])
-	AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la'])
-
-	AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
-	AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
-
 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
@@ -364,6 +322,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	AM_CONDITIONAL(SERIALPLUGIN, test "${serial_enable}" = "yes")
 	AM_CONDITIONAL(NETWORKPLUGIN, test "${network_enable}" = "yes")
 	AM_CONDITIONAL(SERVICEPLUGIN, test "${service_enable}" = "yes")
+	AM_CONDITIONAL(ECHOPLUGIN, test "no" = "yes")
 	AM_CONDITIONAL(HIDD, test "${hidd_enable}" = "yes")
 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
 	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
@@ -374,7 +333,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
 	AM_CONDITIONAL(HID2HCI, test "${hid2hci_enable}" = "yes" && test "${usb_found}" = "yes")
 	AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")
-	AM_CONDITIONAL(MANPAGES, test "${manpages_enable}" = "yes")
 	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
 	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
 ])
diff --git a/audio/Makefile.am b/audio/Makefile.am
deleted file mode 100644
index f396fcd5..00000000
--- a/audio/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-
-BUILT_SOURCES = telephony.c
-
-if AUDIOPLUGIN
-noinst_LTLIBRARIES = audio.la libipc.la
-
-audio_la_SOURCES = main.c \
-	ipc.h ipc.c unix.h unix.c manager.h manager.c telephony.h \
-	device.h device.c headset.h headset.c gateway.h gateway.c \
-	avdtp.h avdtp.c a2dp.h a2dp.c sink.h sink.c source.h source.c \
-	control.h control.c
-
-nodist_audio_la_SOURCES = $(BUILT_SOURCES)
-
-audio_la_LDFLAGS = -module -avoid-version -no-undefined
-
-LDADD = $(top_builddir)/common/libhelper.a \
-		@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
-
-libipc_la_SOURCES = ipc.h ipc.c
-
-if ALSA
-alsadir = $(libdir)/alsa-lib
-
-alsa_LTLIBRARIES = libasound_module_pcm_bluetooth.la libasound_module_ctl_bluetooth.la
-
-libasound_module_pcm_bluetooth_la_SOURCES = pcm_bluetooth.c rtp.h ipc.h ipc.c
-libasound_module_pcm_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_pcm_.*
-libasound_module_pcm_bluetooth_la_LIBADD = @SBC_LIBS@ @BLUEZ_LIBS@ @ALSA_LIBS@
-libasound_module_pcm_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ @BLUEZ_CFLAGS@ @SBC_CFLAGS@
-
-libasound_module_ctl_bluetooth_la_SOURCES = ctl_bluetooth.c rtp.h ipc.h ipc.c
-libasound_module_ctl_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_ctl_.*
-libasound_module_ctl_bluetooth_la_LIBADD = @BLUEZ_LIBS@ @ALSA_LIBS@
-libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ @BLUEZ_CFLAGS@
-
-if CONFIGFILES
-alsaconfdir = $(sysconfdir)/alsa
-
-alsaconf_DATA = bluetooth.conf
-endif
-endif
-
-if GSTREAMER
-gstreamerdir = $(libdir)/gstreamer-0.10
-
-gstreamer_LTLIBRARIES = libgstbluetooth.la
-
-libgstbluetooth_la_SOURCES = gstbluetooth.c \
-				gstsbcenc.h gstsbcenc.c \
-				gstsbcdec.h gstsbcdec.c \
-				gstsbcparse.h gstsbcparse.c \
-				gstavdtpsink.h gstavdtpsink.c \
-				gsta2dpsink.h gsta2dpsink.c \
-				gstsbcutil.h gstsbcutil.c \
-				gstrtpsbcpay.h gstrtpsbcpay.c \
-				rtp.h ipc.h ipc.c
-libgstbluetooth_la_LDFLAGS = -module -avoid-version
-libgstbluetooth_la_LIBADD = @SBC_LIBS@ @BLUEZ_LIBS@ @GSTREAMER_LIBS@ \
-						-lgstaudio-0.10 -lgstrtp-0.10
-libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \
-			 @GSTREAMER_CFLAGS@ @BLUEZ_CFLAGS@ @SBC_CFLAGS@
-endif
-
-noinst_PROGRAMS = ipctest
-
-ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@
-endif
-
-AM_CFLAGS = -fvisibility=hidden -DBLUETOOTH_PLUGIN_BUILTIN @SBC_CFLAGS@ \
-		@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
-
-EXTRA_DIST = audio.conf telephony-dummy.c telephony-maemo.c telephony-ofono.c \
-		bluetooth.conf
-
-MAINTAINERCLEANFILES = Makefile.in
-
-telephony.c: @TELEPHONY_DRIVER@
-	@if [ ! -e $@ ] ; then $(LN_S) $< $@ ; fi
diff --git a/bootstrap-configure b/bootstrap-configure
index 15b3ba7d..5414518b 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -27,6 +27,5 @@ fi
 		--enable-test \
 		--enable-cups \
 		--disable-pcmcia \
-		--disable-manpages \
 		--disable-udevrules \
 		--disable-configfiles $*
diff --git a/client/Makefile.am b/client/Makefile.am
deleted file mode 100644
index 02742923..00000000
--- a/client/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/common/Makefile.am b/common/Makefile.am
deleted file mode 100644
index d6271b19..00000000
--- a/common/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_LIBRARIES = libhelper.a
-
-libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c btio.h btio.c \
-			glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c
-
-noinst_PROGRAMS = test_textfile
-
-test_textfile_LDADD = libhelper.a
-
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
-
-EXTRA_DIST = ppoll.h uinput.h
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/compat/Makefile.am b/compat/Makefile.am
deleted file mode 100644
index 58254adc..00000000
--- a/compat/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-bin_PROGRAMS =
-man_MANS =
-
-if HIDD
-bin_PROGRAMS += hidd
-
-hidd_SOURCES = hidd.c hidd.h sdp.h sdp.c fakehid.c
-
-hidd_LDADD = $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@ -lm
-
-if MANPAGES
-man_MANS += hidd.1
-endif
-endif
-
-if PAND
-bin_PROGRAMS += pand
-
-pand_SOURCES = pand.c pand.h bnep.c sdp.h sdp.c
-
-pand_LDADD = $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@
-
-if MANPAGES
-man_MANS += pand.1
-endif
-endif
-
-if DUND
-bin_PROGRAMS += dund
-
-dund_SOURCES = dund.c dund.h lib.h sdp.h sdp.c dun.c msdun.c
-
-dund_LDADD = $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@
-
-if MANPAGES
-man_MANS += dund.1
-endif
-endif
-
-AM_CFLAGS = @BLUEZ_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/common
-
-EXTRA_DIST = fakehid.txt hidd.1 pand.1 dund.1
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/configure.ac b/configure.ac
index c020aeec..48ca425d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT(bluez, 4.48)
 
-AM_INIT_AUTOMAKE()
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -17,6 +17,7 @@ COMPILER_FLAGS
 AC_LANG_C
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CC_PIE
 AC_PROG_INSTALL
 AC_PROG_YACC
@@ -28,8 +29,6 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-GTK_DOC_CHECK
-
 AC_FUNC_PPOLL
 
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
@@ -45,30 +44,5 @@ AC_PATH_SNDFILE
 
 AC_ARG_BLUEZ
 
-AC_OUTPUT([
-	Makefile
-	include/Makefile
-	lib/Makefile
-	gdbus/Makefile
-	common/Makefile
-	sbc/Makefile
-	src/Makefile
-	test/Makefile
-	cups/Makefile
-	tools/Makefile
-	client/Makefile
-	rfcomm/Makefile
-	compat/Makefile
-	plugins/Makefile
-	network/Makefile
-	serial/Makefile
-	input/Makefile
-	audio/Makefile
-	scripts/Makefile
-	scripts/bluetooth.rules
-	doc/Makefile
-	doc/version.xml
-	src/bluetoothd.8
-	src/hcid.conf.5
-	bluez.pc
-])
+AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
+			src/bluetoothd.8 src/hcid.conf.5 bluez.pc)
diff --git a/cups/Makefile.am b/cups/Makefile.am
deleted file mode 100644
index 70a8ba82..00000000
--- a/cups/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-
-if CUPS
-cupsdir = $(libdir)/cups/backend
-
-cups_PROGRAMS = bluetooth
-
-bluetooth_SOURCES = main.c cups.h sdp.c spp.c hcrp.c
-
-bluetooth_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
-endif
-
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/common
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 6277dccf..00000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-
-DOC_MODULE = bluez
-
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
-
-DOC_SOURCE_DIR = ../src
-
-SCAN_OPTIONS = --rebuild-sections
-
-MKDB_OPTIONS = --sgml-mode --output-format=xml --tmpl-dir=. \
-					--source-suffixes=c,h
-
-MKTMPL_OPTIONS = --output-dir=.
-
-HFILE_GLOB = $(top_srcdir)/src/*.h
-CFILE_GLOB = $(top_srcdir)/src/*.c
-
-IGNORE_HFILES =
-
-MAINTAINERCLEANFILES = Makefile.in \
-	$(DOC_MODULE).types $(DOC_MODULE)-*.txt *.sgml
-
-if ENABLE_GTK_DOC
-include $(top_srcdir)/doc/gtk-doc.make
-else
-EXTRA_DIST = $(DOC_MAIN_SGML_FILE) $(content_files)
-endif
-
-EXTRA_DIST += manager-api.txt adapter-api.txt device-api.txt \
-		service-api.txt agent-api.txt serial-api.txt \
-		network-api.txt input-api.txt audio-api.txt control-api.txt
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 992e987b..00000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-includedir = @includedir@/bluetooth
-
-include_HEADERS = \
-	bluetooth.h hci.h hci_lib.h sco.h l2cap.h \
-	sdp.h sdp_lib.h rfcomm.h bnep.h cmtp.h hidp.h
-
-MAINTAINERCLEANFILES = Makefile.in
-
-all-local:
-	@if [ ! -e bluetooth ] ; then $(LN_S) $(top_srcdir)/include bluetooth ; fi
-
-clean-local:
-	@rm -f bluetooth
diff --git a/input/Makefile.am b/input/Makefile.am
deleted file mode 100644
index 66ed8960..00000000
--- a/input/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-if INPUTPLUGIN
-noinst_LTLIBRARIES = input.la
-
-input_la_SOURCES = main.c manager.h manager.c \
-			server.h server.c device.h device.c \
-						fakehid.c fakehid.h
-endif
-
-AM_LDFLAGS = -module -avoid-version -no-undefined
-
-AM_CFLAGS = -fvisibility=hidden -DBLUETOOTH_PLUGIN_BUILTIN \
-		@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
-
-EXTRA_DIST = input.conf sixpair.c
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index 4778dd2a..00000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-lib_LTLIBRARIES = libbluetooth.la
-
-libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c
-libbluetooth_la_LDFLAGS = -version-info 6:0:3
-
-INCLUDES = -I$(top_builddir)/include
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/lib/bluetooth.c b/lib/bluetooth.c
index 1c34f25a..036b39b3 100644
--- a/lib/bluetooth.c
+++ b/lib/bluetooth.c
@@ -35,8 +35,8 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include "bluetooth.h"
+#include "hci.h"
 
 void baswap(bdaddr_t *dst, const bdaddr_t *src)
 {
diff --git a/include/bluetooth.h b/lib/bluetooth.h
index b0b23a4c..b0b23a4c 100644
--- a/include/bluetooth.h
+++ b/lib/bluetooth.h
diff --git a/include/bnep.h b/lib/bnep.h
index a022c8e4..a022c8e4 100644
--- a/include/bnep.h
+++ b/lib/bnep.h
diff --git a/include/cmtp.h b/lib/cmtp.h
index b7439ac4..b7439ac4 100644
--- a/include/cmtp.h
+++ b/lib/cmtp.h
diff --git a/lib/hci.c b/lib/hci.c
index 6d25a8ba..1afbf875 100644
--- a/lib/hci.c
+++ b/lib/hci.c
@@ -41,9 +41,9 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+#include "bluetooth.h"
+#include "hci.h"
+#include "hci_lib.h"
 
 #ifndef MIN
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
diff --git a/include/hci.h b/lib/hci.h
index ad06445e..ad06445e 100644
--- a/include/hci.h
+++ b/lib/hci.h
diff --git a/include/hci_lib.h b/lib/hci_lib.h
index bd507859..bd507859 100644
--- a/include/hci_lib.h
+++ b/lib/hci_lib.h
diff --git a/include/hidp.h b/lib/hidp.h
index 7ae56c8e..7ae56c8e 100644
--- a/include/hidp.h
+++ b/lib/hidp.h
diff --git a/include/l2cap.h b/lib/l2cap.h
index 8bede467..8bede467 100644
--- a/include/l2cap.h
+++ b/lib/l2cap.h
diff --git a/include/rfcomm.h b/lib/rfcomm.h
index 0765af39..0765af39 100644
--- a/include/rfcomm.h
+++ b/lib/rfcomm.h
diff --git a/include/sco.h b/lib/sco.h
index 43b6069c..43b6069c 100644
--- a/include/sco.h
+++ b/lib/sco.h
diff --git a/lib/sdp.c b/lib/sdp.c
index d147b860..f15d3674 100644
--- a/lib/sdp.c
+++ b/lib/sdp.c
@@ -40,16 +40,15 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-
 #include <netinet/in.h>
 
+#include "bluetooth.h"
+#include "hci.h"
+#include "hci_lib.h"
+#include "l2cap.h"
+#include "sdp.h"
+#include "sdp_lib.h"
+
 #define SDPINF(fmt, arg...) syslog(LOG_INFO, fmt "\n", ## arg)
 #define SDPERR(fmt, arg...) syslog(LOG_ERR, "%s: " fmt "\n", __func__ , ## arg)
 
diff --git a/include/sdp.h b/lib/sdp.h
index 375261ea..375261ea 100644
--- a/include/sdp.h
+++ b/lib/sdp.h
diff --git a/include/sdp_lib.h b/lib/sdp_lib.h
index ee39df83..ee39df83 100644
--- a/include/sdp_lib.h
+++ b/lib/sdp_lib.h
diff --git a/network/Makefile.am b/network/Makefile.am
deleted file mode 100644
index 2a146302..00000000
--- a/network/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-if NETWORKPLUGIN
-noinst_LTLIBRARIES = network.la
-
-network_la_SOURCES = main.c manager.h manager.c \
-				server.h server.c bridge.h bridge.c \
-				connection.h connection.c common.h common.c
-endif
-
-AM_LDFLAGS = -module -avoid-version -no-undefined
-
-AM_CFLAGS = -fvisibility=hidden -DBLUETOOTH_PLUGIN_BUILTIN \
-		@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
-
-EXTRA_DIST = network.conf
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
deleted file mode 100644
index 3895e276..00000000
--- a/plugins/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-plugindir = $(libdir)/bluetooth/plugins
-
-plugin_LTLIBRARIES =
-
-if NETLINK
-plugin_LTLIBRARIES += netlink.la
-netlink_la_LIBADD = @NETLINK_LIBS@
-endif
-
-noinst_LTLIBRARIES = echo.la
-
-AM_LDFLAGS = -module -avoid-version -no-undefined
-
-AM_CFLAGS = -fvisibility=hidden @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ \
-			@GLIB_CFLAGS@ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/rfcomm/Makefile.am b/rfcomm/Makefile.am
deleted file mode 100644
index 9baa8e67..00000000
--- a/rfcomm/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-
-if TOOLS
-if CONFIGFILES
-confdir = $(sysconfdir)/bluetooth
-
-conf_DATA = rfcomm.conf
-endif
-
-bin_PROGRAMS = rfcomm
-
-rfcomm_SOURCES = main.c parser.h parser.y lexer.l kword.h kword.c
-
-rfcomm_LDADD = @BLUEZ_LIBS@
-endif
-
-AM_CFLAGS = @BLUEZ_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/common
-
-BUILT_SOURCES = parser.h
-
-if TOOLS
-if MANPAGES
-man_MANS = rfcomm.1
-endif
-endif
-
-AM_YFLAGS = -d
-
-CLEANFILES = lexer.c parser.c parser.h
-
-EXTRA_DIST = rfcomm.1 rfcomm.conf
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/sbc/Makefile.am b/sbc/Makefile.am
deleted file mode 100644
index f8701641..00000000
--- a/sbc/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-if SNDFILE
-sndfile_programs = sbctester
-else
-sndfile_programs =
-endif
-
-if SBC
-noinst_LTLIBRARIES = libsbc.la
-
-libsbc_la_SOURCES = sbc.h sbc.c sbc_math.h sbc_tables.h \
-	sbc_primitives.h sbc_primitives_mmx.h sbc_primitives_neon.h \
-	sbc_primitives.c sbc_primitives_mmx.c sbc_primitives_neon.c
-
-libsbc_la_CFLAGS = -finline-functions -fgcse-after-reload \
-				-funswitch-loops -funroll-loops
-
-noinst_PROGRAMS = sbcinfo sbcdec sbcenc $(sndfile_programs)
-
-sbcdec_SOURCES = sbcdec.c formats.h
-sbcdec_LDADD = libsbc.la
-
-sbcenc_SOURCES = sbcenc.c formats.h
-sbcenc_LDADD = libsbc.la
-
-if SNDFILE
-sbctester_LDADD = @SNDFILE_LIBS@
-endif
-endif
-
-AM_CFLAGS = @SNDFILE_CFLAGS@
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index cbd30b13..00000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-
-if UDEVRULES
-rulesdir = @UDEV_DATADIR@
-
-rules_DATA = 97-bluetooth.rules
-
-if HID2HCI
-rules_DATA += 97-bluetooth-hid2hci.rules
-endif
-
-if PCMCIA
-rules_DATA += 97-bluetooth-serial.rules
-endif
-endif
-
-if PCMCIA
-udevdir = $(libexecdir)/udev
-
-udev_SCRIPTS = bluetooth_serial
-endif
-
-CLEANFILES = $(rules_DATA)
-
-EXTRA_DIST = bluetooth-hid2hci.rules bluetooth-serial.rules bluetooth_serial
-
-MAINTAINERCLEANFILES = Makefile.in
-
-97-bluetooth.rules: bluetooth.rules
-	cp $< $@
-
-97-bluetooth-hid2hci.rules: bluetooth-hid2hci.rules
-	cp $< $@
-
-97-bluetooth-serial.rules: bluetooth-serial.rules
-	cp $< $@
diff --git a/serial/Makefile.am b/serial/Makefile.am
deleted file mode 100644
index 04c49849..00000000
--- a/serial/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-if SERIALPLUGIN
-noinst_LTLIBRARIES = serial.la
-
-serial_la_SOURCES = main.c manager.h manager.c \
-			port.h port.c proxy.h proxy.c
-
-endif
-
-AM_LDFLAGS = -module -avoid-version -no-undefined
-
-AM_CFLAGS = -fvisibility=hidden -DBLUETOOTH_PLUGIN_BUILTIN \
-		@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
-
-EXTRA_DIST = serial.conf
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 931adcf7..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,111 +0,0 @@
-
-if CONFIGFILES
-dbusdir = $(sysconfdir)/dbus-1/system.d
-
-dbus_DATA = bluetooth.conf
-
-confdir = $(sysconfdir)/bluetooth
-
-conf_DATA = main.conf
-
-statedir = $(localstatedir)/lib/bluetooth
-
-state_DATA =
-endif
-
-builtin_modules =
-builtin_sources =
-builtin_cflags =
-builtin_libadd =
-
-if SERVICEPLUGIN
-builtin_modules += service
-builtin_sources += $(top_srcdir)/plugins/service.c
-endif
-
-builtin_modules += hciops
-builtin_sources += $(top_srcdir)/plugins/hciops.c
-
-builtin_modules += hal
-builtin_sources += $(top_srcdir)/plugins/hal.c
-
-builtin_modules += storage
-builtin_sources += $(top_srcdir)/plugins/storage.c
-
-if NETWORKPLUGIN
-builtin_modules += network
-builtin_libadd += $(top_builddir)/network/network.la
-endif
-
-if SERIALPLUGIN
-builtin_modules += serial
-builtin_libadd += $(top_builddir)/serial/serial.la
-endif
-
-if INPUTPLUGIN
-builtin_modules += input
-builtin_libadd += $(top_builddir)/input/input.la
-endif
-
-if AUDIOPLUGIN
-builtin_modules += audio
-builtin_libadd += $(top_builddir)/audio/audio.la
-endif
-
-noinst_LTLIBRARIES = libbuiltin.la
-
-libbuiltin_la_SOURCES = $(builtin_sources)
-libbuiltin_la_LDFLAGS =
-libbuiltin_la_CFLAGS = $(AM_CFLAGS) \
-			$(builtin_cflags) -DBLUETOOTH_PLUGIN_BUILTIN
-
-BUILT_SOURCES = builtin.h
-
-nodist_libbuiltin_la_SOURCES = $(BUILT_SOURCES)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-sbin_PROGRAMS = bluetoothd
-
-bluetoothd_SOURCES = main.c logging.h logging.c security.c hcid.h sdpd.h \
-	sdpd-server.c sdpd-request.c sdpd-service.c sdpd-database.c \
-	plugin.h plugin.c storage.h storage.c agent.h agent.c rfkill.c \
-	error.h error.c manager.h manager.c adapter.h adapter.c \
-	device.h device.c dbus-common.c dbus-common.h dbus-hci.h dbus-hci.c
-
-bluetoothd_LDADD = $(top_builddir)/common/libhelper.a \
-			libbuiltin.la $(builtin_libadd) \
-			@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ -ldl
-
-bluetoothd_LDFLAGS = -Wl,--export-dynamic
-
-bluetoothd_DEPENDENCIES = libbuiltin.la
-
-if MAINTAINER_MODE
-plugindir = $(abs_top_srcdir)/plugins/.libs
-else
-plugindir = $(libdir)/bluetooth/plugins
-endif
-
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
-						-DPLUGINDIR=\""$(plugindir)"\"
-
-INCLUDES = -I$(top_srcdir)/common
-
-if MANPAGES
-man_MANS = bluetoothd.8
-endif
-
-EXTRA_DIST = bluetooth.conf bluetoothd.8 main.conf
-
-MAINTAINERCLEANFILES = Makefile.in
-
-builtin.h:
-	echo "" > $@
-	list='$(builtin_modules)'; for i in $$list; \
-	  do echo "extern struct bluetooth_plugin_desc __bluetooth_builtin_$$i;" >> $@; done
-	echo "" >> $@
-	echo "static struct bluetooth_plugin_desc *__bluetooth_builtin[] = {" >> $@
-	list='$(builtin_modules)'; for i in $$list; \
-	  do echo "&__bluetooth_builtin_$$i," >> $@; done
-	echo "NULL };" >> $@
diff --git a/src/genbuiltin b/src/genbuiltin
new file mode 100755
index 00000000..8b6f0476
--- /dev/null
+++ b/src/genbuiltin
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+for i in $*
+do
+	echo "extern struct bluetooth_plugin_desc __bluetooth_builtin_$i;"
+done
+
+echo
+echo "static struct bluetooth_plugin_desc *__bluetooth_builtin[] = {"
+
+for i in $*
+do
+	echo "  &__bluetooth_builtin_$i,"
+done
+
+echo "  NULL"
+echo "};"
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 2e58d24c..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-
-if TEST
-sbin_PROGRAMS = hciemu
-
-bin_PROGRAMS = l2test rctest
-
-noinst_PROGRAMS = sdptest scotest attest hstest avtest lmptest \
-						bdaddr agent btiotest
-
-hciemu_LDADD = $(top_builddir)/common/libhelper.a \
-			@GLIB_LIBS@ @BLUEZ_LIBS@
-
-l2test_LDADD = @BLUEZ_LIBS@
-
-rctest_LDADD = @BLUEZ_LIBS@
-
-sdptest_LDADD = @BLUEZ_LIBS@
-
-scotest_LDADD = @BLUEZ_LIBS@
-
-attest_LDADD = @BLUEZ_LIBS@
-
-hstest_LDADD = @BLUEZ_LIBS@
-
-avtest_LDADD = @BLUEZ_LIBS@
-
-bdaddr_SOURCES = bdaddr.c
-
-bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-
-lmptest_LDADD = @BLUEZ_LIBS@
-
-agent_LDADD = @DBUS_LIBS@
-
-btiotest_LDADD = $(top_builddir)/common/libhelper.a @GLIB_LIBS@ @BLUEZ_LIBS@
-
-noinst_MANS = bdaddr.8
-
-if MANPAGES
-man_MANS = rctest.1 hciemu.1
-endif
-
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
-endif
-
-INCLUDES = -I$(top_srcdir)/common
-
-EXTRA_DIST = apitest hsplay hsmicro bdaddr.8 rctest.1 hciemu.1 dbusdef.py \
-		monitor-bluetooth list-devices test-discovery test-manager \
-		test-adapter test-device test-service test-serial \
-		test-telephony test-network simple-agent simple-service \
-		service-record.dtd service-did.xml service-spp.xml \
-		service-opp.xml service-ftp.xml
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 5589a5a8..00000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-
-if TOOLS
-tools_programs = l2ping hcitool sdptool ciptool
-tools_manfiles = l2ping.8 hcitool.1 sdptool.1 ciptool.1
-else
-tools_programs =
-tools_manfiles =
-endif
-
-if BCCMD
-bccmd_programs = bccmd
-bccmd_manfiles = bccmd.8
-else
-bccmd_programs =
-bccmd_manfiles =
-endif
-
-if HID2HCI
-hid2hci_programs = hid2hci
-hid2hci_manfiles = hid2hci.8
-else
-hid2hci_programs =
-hid2hci_manfiles =
-endif
-
-if DFUTOOL
-dfutool_programs = dfutool
-dfutool_manfiles = dfutool.1
-else
-dfutool_programs =
-dfutool_manfiles =
-endif
-
-if USB
-usb_programs = dfubabel avctrl
-else
-usb_programs =
-endif
-
-sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs) $(hid2hci_programs)
-
-bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
-
-noinst_PROGRAMS = hcieventmask hcisecfilter ppporc avinfo $(usb_programs)
-
-hcieventmask_LDADD = @BLUEZ_LIBS@
-
-hciattach_SOURCES = hciattach.c hciattach.h \
-			hciattach_st.c hciattach_ti.c hciattach_tialt.c
-hciattach_LDADD = @BLUEZ_LIBS@
-
-hciconfig_SOURCES = hciconfig.c csr.h csr.c
-hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-
-if TOOLS
-hcitool_SOURCES = hcitool.c
-hcitool_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-
-l2ping_LDADD = @BLUEZ_LIBS@
-
-sdptool_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-
-ciptool_LDADD = @BLUEZ_LIBS@
-
-avinfo_LDADD = @BLUEZ_LIBS@
-endif
-
-ppporc_LDADD = @BLUEZ_LIBS@
-
-if BCCMD
-bccmd_SOURCES = bccmd.c csr.h csr.c csr_hci.c \
-			csr_bcsp.c csr_h4.c csr_3wire.c ubcsp.h ubcsp.c
-bccmd_LDADD = @BLUEZ_LIBS@
-if USB
-bccmd_SOURCES += csr_usb.c
-bccmd_LDADD += @USB_LIBS@
-endif
-endif
-
-if HID2HCI
-hid2hci_LDADD = @USB_LIBS@
-endif
-
-if DFUTOOL
-dfutool_SOURCES = dfutool.c dfu.h dfu.c
-dfutool_LDADD = @USB_LIBS@
-endif
-
-if USB
-dfubabel_LDADD = @USB_LIBS@
-avctrl_LDADD = @USB_LIBS@
-endif
-
-AM_CFLAGS = @BLUEZ_CFLAGS@ @USB_CFLAGS@
-
-INCLUDES = -I$(top_srcdir)/common
-
-if MANPAGES
-man_MANS = hciattach.8 hciconfig.8 $(tools_manfiles) \
-		$(bccmd_manfiles) $(hid2hci_manfiles) $(dfutool_manfiles)
-endif
-
-EXTRA_DIST = hciattach.8 hciconfig.8 l2ping.8 hcitool.1 sdptool.1 ciptool.1 \
-		 bccmd.8 avctrl.8 hid2hci.8 dfutool.1 dfubabel.1 example.psr
-
-MAINTAINERCLEANFILES = Makefile.in