manual test: move to test/core

The strange use of source from a sibling directory seems to be breaking
distcheck:

Making distclean in manual
make[3]: Entering directory '/.../dbus-glib-0.105/_build/sub/test/manual'
Makefile:409: ../core/.deps/my-object.Po: No such file or directory
make[3]: *** No rule to make target '../core/.deps/my-object.Po'.  Stop.

5 files changed, 11 insertions, 33 deletions

diff --git a/configure.ac b/configure.ac
index 5da6b44..d45654d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,7 +302,6 @@ test/data/valid-service-files/debug-glib.service
 test/data/valid-service-files/debug-echo.service
 test/data/valid-service-files/interfaces-test.service
 test/lib/Makefile
-test/manual/Makefile
 tools/Makefile
 dbus-glib-1.pc
 dbus-glib-1-uninstalled.pc
diff --git a/test/Makefile.am b/test/Makefile.am
index 515486b..14c5abf 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = lib . core interfaces manual
-DIST_SUBDIRS = lib core interfaces manual
+SUBDIRS = lib . core interfaces
+DIST_SUBDIRS = lib core interfaces
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)				\
diff --git a/test/core/Makefile.am b/test/core/Makefile.am
index 869ca11..d1be953 100644
--- a/test/core/Makefile.am
+++ b/test/core/Makefile.am
@@ -72,6 +72,7 @@ noinst_PROGRAMS = \
 	test-error-mapping \
 	test-service-glib \
 	$(THREAD_APPS) \
+	manual/test-invalid-usage \
 	peer-server \
 	peer-client \
 	test-types \
@@ -86,6 +87,14 @@ noinst_PROGRAMS = \
 	test-shared-bus \
 	$(NULL)
 
+# This "test" exercises invalid usage. It is deliberately not run in
+# TESTS, because it's (by design) full of bugs.
+manual_test_invalid_usage_SOURCES = \
+	manual/invalid-usage.c \
+	my-object.c \
+	my-object.h \
+	$(NULL)
+
 test_30574_SOURCES = \
 	30574.c
 
diff --git a/test/manual/invalid-usage.c b/test/core/manual/invalid-usage.c
index 95a2591..95a2591 100644
--- a/test/manual/invalid-usage.c
+++ b/test/core/manual/invalid-usage.c
diff --git a/test/manual/Makefile.am b/test/manual/Makefile.am
deleted file mode 100644
index 51122f0..0000000
--- a/test/manual/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/test/core \
-	-I$(top_builddir)/test/core \
-	$(DBUS_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS) \
-	$(NULL)
-
-LDADD = \
-	$(top_builddir)/dbus/libdbus-glib-1.la \
-	$(DBUS_LIBS) \
-	$(DBUS_GLIB_LIBS) \
-	$(NULL)
-
-noinst_PROGRAMS = \
-	$(NULL)
-
-if DBUS_BUILD_TESTS
-noinst_PROGRAMS += \
-	test-invalid-usage \
-	$(NULL)
-endif
-
-# This "test" exercises invalid usage. It is deliberately not run in
-# TESTS, because it's (by design) full of bugs.
-test_invalid_usage_SOURCES = \
-	../core/my-object.c \
-	../core/my-object.h \
-	invalid-usage.c