Move dbus-gmain into subprojects/

This gives it a layout that is compatible with being a Meson subproject.

Signed-off-by: Simon McVittie <smcv@collabora.com>

17 files changed, 11 insertions, 7 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7b1da64..4e5acfc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -136,7 +136,8 @@ branch.
 
 The `dbus-gmain` subproject is shared by `dbus-python` and `dbus-glib`,
 and has its own contributing guidelines (which are similar to these).
-Please see [dbus-gmain/CONTRIBUTING.md](dbus-gmain/CONTRIBUTING.md)
+Please see
+[subprojects/dbus-gmain/CONTRIBUTING.md](subprojects/dbus-gmain/CONTRIBUTING.md)
 for details.
 
 ## Information for maintainers
@@ -150,7 +151,7 @@ a checkout of the `dbus-gmain` branch of the
 [dbus-glib](https://gitlab.freedesktop.org/dbus/dbus-glib) repository in
 the `../dbus-gmain` directory:
 
-    git subtree pull -P dbus-gmain ../dbus-gmain HEAD
+    git subtree pull -P subprojects/dbus-gmain ../dbus-gmain HEAD
 
 ### Committing other people's patches
 
diff --git a/Makefile.am b/Makefile.am
index 4329772..e730ec9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ installed_test_metadir = ${datadir}/installed-tests/${PACKAGE_TARNAME}
 AM_DISTCHECK_CONFIGURE_FLAGS = PYTHON=$(PYTHON) --with-python-prefix='$${prefix}' --with-python-exec-prefix='$${exec_prefix}'
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = dbus-gmain .
+SUBDIRS = subprojects/dbus-gmain .
 
 CLEANFILES = \
 	test/test-service.log \
@@ -43,6 +43,7 @@ EXTRA_DIST = \
 AM_CPPFLAGS = \
 	-include config.h \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/subprojects \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PYTHON_CPPFLAGS) \
@@ -125,8 +126,8 @@ _dbus_bindings_la_SOURCES = \
 	dbus_bindings/validation.c \
 	$(NULL)
 
-dbus-gmain/libdbus-gmain.la:
-	$(MAKE) -C dbus-gmain
+subprojects/dbus-gmain/libdbus-gmain.la:
+	$(MAKE) -C subprojects/dbus-gmain
 
 _dbus_glib_bindings_la_LDFLAGS = \
 	$(pymod_ldflags) \
@@ -134,7 +135,7 @@ _dbus_glib_bindings_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(NULL)
 _dbus_glib_bindings_la_LIBADD = \
-	dbus-gmain/libdbus-gmain.la \
+	subprojects/dbus-gmain/libdbus-gmain.la \
 	$(pymod_libadd) \
 	$(DBUS_LIBS) \
 	$(NULL)
diff --git a/configure.ac b/configure.ac
index 9b2c90e..a5a699d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ AH_BOTTOM([
 
 AC_CONFIG_FILES([
   Makefile
-  dbus-gmain/Makefile
   dbus-python.pc
+  subprojects/dbus-gmain/Makefile
 ])
 AC_OUTPUT
diff --git a/dbus-gmain/.gitignore b/subprojects/dbus-gmain/.gitignore
index ba527ff..ba527ff 100644
--- a/dbus-gmain/.gitignore
+++ b/subprojects/dbus-gmain/.gitignore
diff --git a/dbus-gmain/AUTHORS b/subprojects/dbus-gmain/AUTHORS
index 83c7766..83c7766 100644
--- a/dbus-gmain/AUTHORS
+++ b/subprojects/dbus-gmain/AUTHORS
diff --git a/dbus-gmain/CONTRIBUTING.md b/subprojects/dbus-gmain/CONTRIBUTING.md
index 5bbcee1..5bbcee1 100644
--- a/dbus-gmain/CONTRIBUTING.md
+++ b/subprojects/dbus-gmain/CONTRIBUTING.md
diff --git a/dbus-gmain/COPYING b/subprojects/dbus-gmain/COPYING
index d89d965..d89d965 100644
--- a/dbus-gmain/COPYING
+++ b/subprojects/dbus-gmain/COPYING
diff --git a/dbus-gmain/Makefile.am b/subprojects/dbus-gmain/Makefile.am
index 63a1a2a..9460400 100644
--- a/dbus-gmain/Makefile.am
+++ b/subprojects/dbus-gmain/Makefile.am
@@ -9,7 +9,9 @@ EXTRA_DIST = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/subprojects \
 	-I$(top_builddir) \
+	-I$(top_builddir)/subprojects \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(NULL)
diff --git a/dbus-gmain/README.md b/subprojects/dbus-gmain/README.md
index 8f40161..8f40161 100644
--- a/dbus-gmain/README.md
+++ b/subprojects/dbus-gmain/README.md
diff --git a/dbus-gmain/dbus-gmain.c b/subprojects/dbus-gmain/dbus-gmain.c
index 06a480c..06a480c 100644
--- a/dbus-gmain/dbus-gmain.c
+++ b/subprojects/dbus-gmain/dbus-gmain.c
diff --git a/dbus-gmain/dbus-gmain.h b/subprojects/dbus-gmain/dbus-gmain.h
index b8df034..b8df034 100644
--- a/dbus-gmain/dbus-gmain.h
+++ b/subprojects/dbus-gmain/dbus-gmain.h
diff --git a/dbus-gmain/tests/30574.c b/subprojects/dbus-gmain/tests/30574.c
index bcc1276..bcc1276 100644
--- a/dbus-gmain/tests/30574.c
+++ b/subprojects/dbus-gmain/tests/30574.c
diff --git a/dbus-gmain/tests/test-thread-client.c b/subprojects/dbus-gmain/tests/test-thread-client.c
index a115d41..a115d41 100644
--- a/dbus-gmain/tests/test-thread-client.c
+++ b/subprojects/dbus-gmain/tests/test-thread-client.c
diff --git a/dbus-gmain/tests/test-thread-server.c b/subprojects/dbus-gmain/tests/test-thread-server.c
index 54f43b6..54f43b6 100644
--- a/dbus-gmain/tests/test-thread-server.c
+++ b/subprojects/dbus-gmain/tests/test-thread-server.c
diff --git a/dbus-gmain/tests/test-thread.h b/subprojects/dbus-gmain/tests/test-thread.h
index 8c78fba..8c78fba 100644
--- a/dbus-gmain/tests/test-thread.h
+++ b/subprojects/dbus-gmain/tests/test-thread.h
diff --git a/dbus-gmain/tests/util.c b/subprojects/dbus-gmain/tests/util.c
index 07da5d9..07da5d9 100644
--- a/dbus-gmain/tests/util.c
+++ b/subprojects/dbus-gmain/tests/util.c
diff --git a/dbus-gmain/tests/util.h b/subprojects/dbus-gmain/tests/util.h
index 0d8bfa3..0d8bfa3 100644
--- a/dbus-gmain/tests/util.h
+++ b/subprojects/dbus-gmain/tests/util.h