summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-08-23 19:48:30 +0000
committerColin Walters <walters@verbum.org>2005-08-23 19:48:30 +0000
commitf837e62f501444fbd2b61f46bdec398503c70ee2 (patch)
tree40431639b7db5e6d33f75ca9629b85f7e1abba7a
parent54988532f404d17141807b5dc59dd6acd6e9633b (diff)
2005-08-23 Colin Walters <walters@verbum.org>
* test/glib/Makefile.am (test_profile_LDADD): Don't multiply-define EXTRA_DIST.
-rw-r--r--ChangeLog5
-rw-r--r--test/glib/Makefile.am7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 20cc11e2..4b44eabf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-23 Colin Walters <walters@verbum.org>
+
+ * test/glib/Makefile.am (test_profile_LDADD): Don't multiply-define
+ EXTRA_DIST.
+
2005-08-23 John (J5) Palmieri <johnp@redhat.com>
* python/dbus_glib_bindings.pyx: reorder imports and c definitions
diff --git a/test/glib/Makefile.am b/test/glib/Makefile.am
index cf837c8f..aebaf37c 100644
--- a/test/glib/Makefile.am
+++ b/test/glib/Makefile.am
@@ -10,7 +10,7 @@ else
TESTS=
endif
-EXTRA_DIST=run-test.sh test-service-glib.xml
+EXTRA_DIST=run-test.sh test-service-glib.xml my-object-marshal.list test-service-glib.xml
if DBUS_BUILD_TESTS
@@ -78,8 +78,3 @@ test_profile_SOURCES= \
test_profile_LDADD= $(DBUS_GLIB_THREADS_LIBS) $(top_builddir)/glib/libdbus-glib-1.la
endif
-
-EXTRA_DIST = \
- my-object-marshal.list \
- test-service-glib.xml
-