Use non-recursive make for dbus/ to work around types.py clash with top-level types module (fd.o #12741)

2 files changed, 30 insertions, 34 deletions

diff --git a/Makefile.am b/Makefile.am
index b35ace5..6cba42f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ abs_top_builddir = @abs_top_builddir@
 ACLOCAL_AMFLAGS = -I m4
 
 # the api, doc, include subdirs don't need their own Makefile.am
-SUBDIRS = _dbus_bindings _dbus_glib_bindings dbus examples m4 test tools
+# the dbus subdir is handled with non-recursive make because of #12741
+SUBDIRS = _dbus_bindings _dbus_glib_bindings examples m4 test tools
 
 CLEANFILES =
 EXTRA_DIST = \
@@ -16,14 +17,39 @@ EXTRA_DIST = \
 	COPYING.AFL-2.1
 # miss out the gconf examples for now - they don't work
 
+# === dbus package ===
+
+nobase_python_PYTHON = \
+    dbus_bindings.py \
+    dbus/bus.py \
+    dbus/connection.py \
+    dbus/dbus_bindings.py \
+    dbus/_dbus.py \
+    dbus/_version.py \
+    dbus/decorators.py \
+    dbus/exceptions.py \
+    dbus/_expat_introspect_parser.py \
+    dbus/glib.py \
+    dbus/gobject_service.py \
+    dbus/__init__.py \
+    dbus/lowlevel.py \
+    dbus/mainloop/__init__.py \
+    dbus/mainloop/glib.py \
+    dbus/proxies.py \
+    dbus/service.py \
+    dbus/types.py
+
+check_py_sources = $(nobase_python_PYTHON)
+include $(top_srcdir)/tools/check-coding-style.mk
+
+# === Devel stuff ===
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dbus-python.pc
 
 dbusincludedir = $(includedir)/dbus-1.0/dbus
 dbusinclude_HEADERS = include/dbus-python.h
 
-python_PYTHON = dbus_bindings.py
-
 # === Tests ===
 
 cross-test-compile: all
@@ -81,8 +107,6 @@ all: api/index.html
 clean-local:
 	rm -rf api
 
-dbus/.doc-needs-rebuild-stamp:
-	$(MAKE) -C dbus
 _dbus_bindings/_dbus_bindings.la:
 	$(MAKE) -C _dbus_bindings
 _dbus_glib_bindings/_dbus_glib_bindings.la:
@@ -90,7 +114,7 @@ _dbus_glib_bindings/_dbus_glib_bindings.la:
 
 APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs
 
-api api/index.html: $(python_PYTHON) dbus/.doc-needs-rebuild-stamp \
+api api/index.html: $(nobase_python_PYTHON) \
 		    _dbus_bindings/_dbus_bindings.la \
 		    _dbus_glib_bindings/_dbus_glib_bindings.la
 	rm -rf api
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
deleted file mode 100644
index fc30f53..0000000
--- a/dbus/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-pythondbusdir = $(pythondir)/dbus
-
-nobase_pythondbus_PYTHON = bus.py \
-			   connection.py \
-			   dbus_bindings.py \
-			   _dbus.py \
-			   _version.py \
-			   decorators.py \
-			   exceptions.py \
-			   _expat_introspect_parser.py \
-			   glib.py \
-			   gobject_service.py \
-			   __init__.py \
-			   lowlevel.py \
-			   mainloop/__init__.py \
-			   mainloop/glib.py \
-			   proxies.py \
-			   service.py \
-			   types.py
-
-check_py_sources = $(nobase_pythondbus_PYTHON)
-include $(top_srcdir)/tools/check-coding-style.mk
-
-CLEANFILES = .doc-needs-rebuild-stamp
-BUILT_SOURCES = .doc-needs-rebuild-stamp
-
-.doc-needs-rebuild-stamp: $(nobase_pythondbus_PYTHON)
-	touch $@