r22851 - gnucash/trunk - More Makefile changes to get distcheck to pass

[John Ralls]

Author: jralls
Date: 2013-03-30 17:31:17 -0400 (Sat, 30 Mar 2013)
New Revision: 22851
Trac: http://svn.gnucash.org/trac/changeset/22851

Modified:
   gnucash/trunk/doc/Makefile.am
   gnucash/trunk/src/backend/dbi/test/Makefile.am
   gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c
   gnucash/trunk/src/backend/sql/test/Makefile.am
Log:
More Makefile changes to get distcheck to pass

Modified: gnucash/trunk/doc/Makefile.am
===================================================================
--- gnucash/trunk/doc/Makefile.am	2013-03-30 16:01:35 UTC (rev 22850)
+++ gnucash/trunk/doc/Makefile.am	2013-03-30 21:31:17 UTC (rev 22851)
@@ -60,4 +60,7 @@
 	perl -pi.bak -e 's/" *$$/\n/' $@
 endif
 
-DISTCLEANFILES = gnucash.1 tip_of_the_day.list
+DISTCLEANFILES = \
+	gnucash.1 \
+	tip_of_the_day.list \
+	tip_of_the_day.list.bak

Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am	2013-03-30 16:01:35 UTC (rev 22850)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am	2013-03-30 21:31:17 UTC (rev 22851)
@@ -46,7 +46,8 @@
 
 EXTRA_DIST += \
     test-dbi-stuff.h \
-    test-dbi-business-stuff.h
+    test-dbi-business-stuff.h \
+    test-dbi.xml
 
 TEST_PROGS += \
     test-backend-dbi

Modified: gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c
===================================================================
--- gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c	2013-03-30 16:01:35 UTC (rev 22850)
+++ gnucash/trunk/src/backend/dbi/test/utest-backend-dbi-basic.c	2013-03-30 21:31:17 UTC (rev 22851)
@@ -30,8 +30,12 @@
 setup (Fixture *fixture, gconstpointer pData)
 {
     fixture->session = qof_session_new();
-    qof_session_begin( fixture->session, DBI_TEST_XML_FILENAME, FALSE,
-		       FALSE, FALSE );
+    /* When running distcheck the source directory is read-only, which
+     * prevents creating the lock file. Force the session to get
+     * around that.
+     */
+    qof_session_begin( fixture->session, DBI_TEST_XML_FILENAME, TRUE,
+		       FALSE, TRUE );
     g_assert_cmpint (qof_session_get_error (fixture->session), ==,
 		     ERR_BACKEND_NO_ERR);
     qof_session_load( fixture->session, NULL );

Modified: gnucash/trunk/src/backend/sql/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/test/Makefile.am	2013-03-30 16:01:35 UTC (rev 22850)
+++ gnucash/trunk/src/backend/sql/test/Makefile.am	2013-03-30 21:31:17 UTC (rev 22851)
@@ -53,7 +53,7 @@
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
 
 TEST_PROGS += test-sqlbe
-test_sqlbedir = ${top_srcdir}/${MODULEPATH}/test
+#test_sqlbedir = ${top_srcdir}/${MODULEPATH}/test
 
 noinst_PROGRAMS = $(TESTS) $(TEST_PROGS)
 
@@ -61,8 +61,8 @@
 	test-sqlbe.c \
 	utest-gnc-backend-sql.c
 
-test_sqlbe_HEADERS = \
-	$(top_srcdir)/$(MODULEPATH)/gnc-backend-sql.h
+#test_sqlbe_HEADERS = \
+#	$(top_srcdir)/$(MODULEPATH)/gnc-backend-sql.h
 
 test_sqlbe_LDADD = \
 	$(top_builddir)/$(MODULEPATH)/libgnc-backend-sql.la \