Use non-recursive make for everything except tests

8 files changed, 127 insertions, 144 deletions

diff --git a/Makefile.am b/Makefile.am
index ebc2e43..7b273ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,17 +3,126 @@ abs_top_builddir = @abs_top_builddir@
 
 ACLOCAL_AMFLAGS = -I m4
 
-# the api, doc, include subdirs don't need their own Makefile.am
-# the dbus subdir is handled with non-recursive make because of #12741
-SUBDIRS = _dbus_bindings _dbus_glib_bindings examples m4 test tools .
+SUBDIRS = test
 
 CLEANFILES =
 EXTRA_DIST = \
 	dbus-python.pc.in \
 	AUTHORS \
 	COPYING \
-	ChangeLog
-# miss out the gconf examples for now - they don't work
+	ChangeLog \
+	examples/example-async-client.py \
+	examples/example-client.py \
+	examples/example-service.py \
+	examples/example-signal-emitter.py \
+	examples/example-signal-recipient.py \
+	examples/gconf-proxy-client.py \
+	examples/gconf-proxy-service2.py \
+	examples/list-system-services.py \
+	examples/unix-fd-client.py \
+	examples/unix-fd-service.py \
+	m4/am-check-pymod.m4 \
+	m4/am-check-python-headers.m4 \
+	m4/dbus-py-add-rst2htmlflag.m4 \
+	tools/check-coding-style.mk \
+	tools/check-c-style.sh \
+	tools/check-py-style.sh \
+	tools/check-whitespace.sh
+	$(NULL)
+
+# === C code ===
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	$(DBUS_CFLAGS) \
+	$(DBUS_GLIB_CFLAGS) \
+	$(PYTHON_INCLUDES) \
+	$(NULL)
+AM_CFLAGS = \
+	$(WARN_CFLAGS) \
+	$(NULL)
+AM_LDFLAGS = \
+	$(WARN_LDFLAGS) \
+	$(NULL)
+
+pymod_ldflags = \
+	-module \
+	-avoid-version \
+	$(NULL)
+pymod_libadd = \
+	$(NULL)
+
+if WINDOWS
+# Win32 DLLs can't have undefined symbols (so this needs explicit linking
+# against the Python DLL), and Python expects extensions to be *.pyd
+# instead of *.dll
+pymod_ldflags += \
+	-no-undefined \
+	-shrext ".pyd" \
+	$(NULL)
+pymod_libadd += \
+	$(PYTHON_LIBS) \
+	$(NULL)
+endif
+
+pyexec_LTLIBRARIES = \
+	_dbus_bindings.la \
+	_dbus_glib_bindings.la \
+	$(NULL)
+
+_dbus_bindings_la_LDFLAGS = \
+	$(pymod_ldflags) \
+	-export-symbols-regex \(PyInit__\|init_\)dbus_bindings \
+	$(AM_LDFLAGS) \
+	$(NULL)
+_dbus_bindings_la_LIBADD = \
+	$(pymod_libadd) \
+	$(DBUS_LIBS) \
+	$(NULL)
+_dbus_bindings_la_SOURCES = \
+	_dbus_bindings/abstract.c \
+	_dbus_bindings/bus.c \
+	_dbus_bindings/bytes.c \
+	_dbus_bindings/compat-internal.h \
+	_dbus_bindings/conn.c \
+	_dbus_bindings/conn-internal.h \
+	_dbus_bindings/conn-methods.c \
+	_dbus_bindings/containers.c \
+	_dbus_bindings/dbus_bindings-internal.h \
+	_dbus_bindings/debug.c \
+	_dbus_bindings/exceptions.c \
+	_dbus_bindings/float.c \
+	_dbus_bindings/generic.c \
+	_dbus_bindings/int.c \
+	_dbus_bindings/unixfd.c \
+	_dbus_bindings/libdbusconn.c \
+	_dbus_bindings/mainloop.c \
+	_dbus_bindings/message-append.c \
+	_dbus_bindings/message.c \
+	_dbus_bindings/message-get-args.c \
+	_dbus_bindings/message-internal.h \
+	_dbus_bindings/module.c \
+	_dbus_bindings/pending-call.c \
+	_dbus_bindings/server.c \
+	_dbus_bindings/signature.c \
+	_dbus_bindings/string.c \
+	_dbus_bindings/types-internal.h \
+	_dbus_bindings/validation.c \
+	$(NULL)
+
+_dbus_glib_bindings_la_LDFLAGS = \
+	$(pymod_ldflags) \
+	-export-symbols-regex \(PyInit__\|init_\)dbus_glib_bindings \
+	$(AM_LDFLAGS) \
+	$(NULL)
+_dbus_glib_bindings_la_LIBADD = \
+	$(pymod_libadd) \
+	$(DBUS_LIBS) \
+	$(DBUS_GLIB_LIBS) \
+	$(NULL)
+_dbus_glib_bindings_la_SOURCES = \
+	_dbus_glib_bindings/module.c \
+	$(NULL)
 
 # === dbus package ===
 
@@ -123,16 +232,11 @@ all: api/index.html
 clean-local:
 	rm -rf api
 
-_dbus_bindings/_dbus_bindings.la:
-	$(MAKE) -C _dbus_bindings
-_dbus_glib_bindings/_dbus_glib_bindings.la:
-	$(MAKE) -C _dbus_glib_bindings
-
-APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs
+APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/.libs
 
 api api/index.html: $(nobase_python_PYTHON) \
-		    _dbus_bindings/_dbus_bindings.la \
-		    _dbus_glib_bindings/_dbus_glib_bindings.la
+		    _dbus_bindings.la \
+		    _dbus_glib_bindings.la
 	rm -rf api
 	mkdir api
 	cd $(abs_top_srcdir) && \
@@ -154,6 +258,13 @@ _maintainer-update-apidocs:
 	@echo "*** alpha (or newer) and configure with --enable-api-docs"
 endif
 
+check_c_sources = \
+	$(_dbus_bindings_la_SOURCES) \
+	$(_dbus_glib_bindings_la_SOURCES) \
+	$(NULL)
+
+include $(top_srcdir)/tools/check-coding-style.mk
+
 .PHONY: cross-test-compile cross-test-server cross-test-client \
 	always-rebuild maintainer-update-website \
 	_maintainer-update-apidocs _maintainer-update-htmldocs \
diff --git a/_dbus_bindings/Makefile.am b/_dbus_bindings/Makefile.am
deleted file mode 100644
index e0610c9..0000000
--- a/_dbus_bindings/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-pyexec_LTLIBRARIES = _dbus_bindings.la
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	$(DBUS_CFLAGS) \
-	$(PYTHON_INCLUDES) \
-	$(NULL)
-AM_CFLAGS = \
-	$(WARN_CFLAGS) \
-	$(NULL)
-AM_LDFLAGS = \
-	-module -avoid-version \
-	-export-symbols-regex \(PyInit__\|init_\)dbus_bindings \
-	$(WARN_LDFLAGS) \
-	$(NULL)
-
-libadd = $(DBUS_LIBS)
-
-if WINDOWS
-# Win32 DLLs can't have undefined symbols (so this needs explicit linking
-# against the Python DLL), and Python expects extensions to be *.pyd
-# instead of *.dll
-AM_LDFLAGS += \
-	-no-undefined \
-	-shrext ".pyd" \
-	$(NULL)
-
-libadd += \
-	$(PYTHON_LIBS) \
-	$(NULL)
-endif
-
-_dbus_bindings_la_LIBADD = $(libadd)
-_dbus_bindings_la_SOURCES = \
-			    abstract.c \
-			    bus.c \
-			    bytes.c \
-			    compat-internal.h \
-			    conn.c \
-			    conn-internal.h \
-			    conn-methods.c \
-			    containers.c \
-			    dbus_bindings-internal.h \
-			    debug.c \
-			    exceptions.c \
-			    float.c \
-			    generic.c \
-			    int.c \
-			    unixfd.c \
-			    libdbusconn.c \
-			    mainloop.c \
-			    message-append.c \
-			    message.c \
-			    message-get-args.c \
-			    message-internal.h \
-			    module.c \
-			    pending-call.c \
-			    server.c \
-			    signature.c \
-			    string.c \
-			    types-internal.h \
-			    validation.c
-
-check_c_sources = $(_dbus_bindings_la_SOURCES)
-include $(top_srcdir)/tools/check-coding-style.mk
diff --git a/_dbus_glib_bindings/Makefile.am b/_dbus_glib_bindings/Makefile.am
deleted file mode 100644
index b4c8715..0000000
--- a/_dbus_glib_bindings/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-pyexec_LTLIBRARIES = _dbus_glib_bindings.la
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	$(DBUS_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS) \
-	$(PYTHON_INCLUDES) \
-	$(NULL)
-AM_CFLAGS = \
-	$(WARN_CFLAGS) \
-	$(NULL)
-AM_LDFLAGS = \
-	-module -avoid-version \
-	-export-symbols-regex \(PyInit__\|init_\)dbus_glib_bindings \
-	$(WARN_LDFLAGS) \
-	$(NULL)
-
-libadd = \
-	$(DBUS_LIBS) \
-	$(DBUS_GLIB_LIBS) \
-	$(NULL)
-
-if WINDOWS
-# Win32 DLLs can't have undefined symbols (so this needs explicit linking
-# against the Python DLL), and Python expects extensions to be *.pyd
-# instead of *.dll
-AM_LDFLAGS += \
-	-no-undefined \
-	-shrext ".pyd" \
-	$(NULL)
-
-libadd += \
-	$(PYTHON_LIBS) \
-	$(NULL)
-endif
-
-_dbus_glib_bindings_la_LIBADD = $(libadd)
-_dbus_glib_bindings_la_SOURCES = module.c
diff --git a/configure.ac b/configure.ac
index e5bbc83..01c40b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,16 +219,12 @@ AC_ARG_ENABLE(coding-style-checks,
     [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes])
     ])
 
-AC_CONFIG_FILES(
+AC_CONFIG_FILES([
   Makefile
-  _dbus_bindings/Makefile
-  _dbus_glib_bindings/Makefile
   dbus-python.pc
   dbus/_version.py
-  examples/Makefile
-  m4/Makefile
   test/Makefile
   test/tmp-session-bus.conf
   test/TestSuitePythonService.service
-  tools/Makefile)
+])
 AC_OUTPUT
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index df241a6..0000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_DIST = \
-	     example-async-client.py \
-	     example-client.py \
-	     example-service.py \
-	     example-signal-emitter.py \
-	     example-signal-recipient.py \
-	     gconf-proxy-client.py \
-	     gconf-proxy-service2.py \
-	     list-system-services.py \
-	     unix-fd-client.py \
-	     unix-fd-service.py
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index a924560..0000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = \
-    am-check-pymod.m4 \
-    am-check-python-headers.m4 \
-    dbus-py-add-rst2htmlflag.m4 \
-    $(NULL)
diff --git a/test/Makefile.am b/test/Makefile.am
index d7674eb..dae9208 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -50,7 +50,7 @@ AM_TESTS_ENVIRONMENT = \
 	export DBUS_TOP_SRCDIR="$(abs_top_srcdir)"; \
 	export DBUS_TOP_BUILDDIR="$(abs_top_builddir)"; \
 	export DBUS_PYTHON_VERSION='$(PACKAGE_VERSION)'; \
-	export PYTHONPATH="$(abs_top_builddir)/test/.libs:$(abs_top_srcdir):$(abs_top_srcdir)/test:$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs"; \
+	export PYTHONPATH="$(abs_top_builddir)/test/.libs:$(abs_top_srcdir):$(abs_top_srcdir)/test:$(abs_top_builddir)/.libs"; \
 	export PYTHON='$(PYTHON)'; \
 	export DBUS_FATAL_WARNINGS=1; \
 	$(NULL)
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 122fa82..0000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = \
-    check-coding-style.mk \
-    check-c-style.sh \
-    check-py-style.sh \
-    check-whitespace.sh