[glom] Fix make dist



commit 072e66f9a6ecff1e358cb12b50162f6e70256c8f
Author: Johannes Schmid <jhs gnome org>
Date:   Mon Aug 31 14:36:29 2009 +0200

    Fix make dist

 ChangeLog         |    6 ++++++
 Makefile_tests.am |   10 ++++++++--
 config.h.in       |    4 ----
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 80ba3fe..05a8382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-31  Johannes Schmid  <jschmid openismus com>
+	
+	* Makefile_test.am: Fixed make dist (probably automake-1.11 is more
+	clever but it does not build with automake-1.10 because it assumes
+	that the test programs have sources in form of xxx.c and not xxx.cc
+
 2009-08-27  Murray Cumming  <murrayc murrayc com>
 
 	Avoid GTK+ warnings.
diff --git a/Makefile_tests.am b/Makefile_tests.am
index 4c4c84b..b3a4409 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -30,10 +30,16 @@ TESTS =	regression_tests/test_parsing_time	\
 
 tests_ldadd = glom/libglom/libglom-$(GLOM_ABI_VERSION).la $(LIBGLOM_LIBS)
 
-glom_libglom_test_connectionpool_LDADD = $(tests_ldadd)
+glom_libglom_test_connectionpool_SOURCES = glom/libglom/test_connectionpool.cc
+glom_libglom_test_document_SOURCES = glom/libglom/test_document.cc
+glom_libglom_test_sharedptr_layoutitem_SOURCES = glom/libglom/test_sharedptr_layoutitem.cc
+glom_test_pyembed_SOURCES = glom/test_pyembed.cc
+regression_tests_test_parsing_time_SOURCES = regression_tests/test_parsing_time.cc
+regression_tests_test_signal_reemit_SOURCES = regression_tests/test_signal_reemit.cc
+
+glom_libglom_test_connectionpool_LDADD = $(testsb_ldadd)
 glom_libglom_test_document_LDADD = $(tests_ldadd)
 glom_libglom_test_sharedptr_layoutitem_LDADD = $(tests_ldadd)
-
 glom_utility_widgets_test_flowtable_SOURCES =	\
 	glom/utility_widgets/flowtable.cc	\
 	glom/utility_widgets/flowtable.h	\
diff --git a/config.h.in b/config.h.in
index c04b374..2c8039a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -81,10 +81,6 @@
 /* Define to the installation prefix of the iso-codes module. */
 #undef ISO_CODES_PREFIX
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]