gnucash master: Fix make distcheck
Geert Janssens
gjanssens at code.gnucash.org
Fri Jan 16 13:26:58 EST 2015
Updated via https://github.com/Gnucash/gnucash/commit/98fe3364 (commit)
from https://github.com/Gnucash/gnucash/commit/1348d5b9 (commit)
commit 98fe33643064d15cf5bc1817b6f9026fb5c32da3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jan 16 18:48:52 2015 +0100
Fix make distcheck
- make the Google Test Suite really optional (for now)
- add some missing scm files to POTFILES.skip
- add missing c++ header files in qof
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f4cb487..d3c9b84 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -435,6 +435,7 @@ src/libqof/qof/gnc-rational.cpp
src/libqof/qof/guid.cpp
src/libqof/qof/kvp_frame.cpp
src/libqof/qof/kvp-util.cpp
+src/libqof/qof/kvp-value.cpp
src/libqof/qof/qofbackend.cpp
src/libqof/qof/qofbook.cpp
src/libqof/qof/qofchoice.cpp
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d99b45e..92ba937 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -47,6 +47,8 @@ src/report/business-reports/gnucash/report/invoice.scm
src/report/business-reports/gnucash/report/job-report.scm
src/report/business-reports/gnucash/report/owner-report.scm
src/report/business-reports/gnucash/report/payables.scm
+src/report/business-reports/gnucash/report/receipt.eguile.scm
+src/report/business-reports/gnucash/report/receipt.scm
src/report/business-reports/gnucash/report/receivables.scm
src/report/business-reports/gnucash/report/taxinvoice.eguile.scm
src/report/business-reports/gnucash/report/taxinvoice.scm
@@ -54,6 +56,8 @@ src/report/business-reports/invoice.scm
src/report/business-reports/job-report.scm
src/report/business-reports/owner-report.scm
src/report/business-reports/payables.scm
+src/report/business-reports/receipt.eguile.scm
+src/report/business-reports/receipt.scm
src/report/business-reports/receivables.scm
src/report/business-reports/taxinvoice.eguile.scm
src/report/business-reports/taxinvoice.scm
diff --git a/src/libqof/qof/Makefile.am b/src/libqof/qof/Makefile.am
index 07c40da..0c37dfd 100644
--- a/src/libqof/qof/Makefile.am
+++ b/src/libqof/qof/Makefile.am
@@ -57,6 +57,8 @@ qofinclude_HEADERS = \
kvp-util-p.h \
kvp-util.h \
kvp_frame.h \
+ kvp_frame.hpp \
+ kvp-value.hpp \
qof.h \
qofbackend-p.h \
qofbackend.h \
diff --git a/src/libqof/qof/test/Makefile.am b/src/libqof/qof/test/Makefile.am
index 43ebb91..f17e4a2 100644
--- a/src/libqof/qof/test/Makefile.am
+++ b/src/libqof/qof/test/Makefile.am
@@ -36,9 +36,11 @@ TESTS = ${check_PROGRAMS}
if WITH_GOOGLE_TEST
test_gnc_int128_SOURCES = \
$(top_srcdir)/${MODULEPATH}/gnc-int128.cpp \
- ${GTEST_ROOT}/src/gtest_main.cc \
gtest-gnc-int128.cpp
+nodist_test_gnc_int128_SOURCES = \
+ ${GTEST_ROOT}/src/gtest_main.cc
+
test_gnc_int128_CPPFLAGS = \
-I${GTEST_HEADERS} \
${GLIB_CFLAGS}
@@ -69,10 +71,12 @@ test_qof_CPPFLAGS = \
if WITH_GOOGLE_TEST
test_kvp_value_SOURCES = \
$(top_srcdir)/$(MODULEPATH)/kvp-value.cpp \
- $(GTEST_ROOT)/src/gtest_main.cc \
test-kvp-value.cpp \
test-kvp-frame.cpp
+nodist_test_kvp_value_SOURCES = \
+ $(GTEST_ROOT)/src/gtest_main.cc
+
test_kvp_value_LDADD = \
$(top_builddir)/$(MODULEPATH)/libgnc-qof.la \
$(top_builddir)/src/test-core/libgtest.a \
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index d29a997..636c582 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -83,8 +83,8 @@ if WITH_GOOGLE_TEST
noinst_LIBRARIES = \
libgtest.a \
libgmock.a
-libgtest_a_SOURCES = ${GTEST_ROOT}/src/gtest-all.cc
-libgmock_a_SOURCES = ${GMOCK_ROOT}/src/gmock-all.cc
+nodist_libgtest_a_SOURCES = ${GTEST_ROOT}/src/gtest-all.cc
+nodist_libgmock_a_SOURCES = ${GMOCK_ROOT}/src/gmock-all.cc
libgtest_a_CPPFLAGS = ${AM_CPPFLAGS} -I${GTEST_HEADERS} -I${GTEST_ROOT}
libgmock_a_CPPFLAGS = ${libgtest_a_CPPFLAGS} -I${GMOCK_HEADERS} -I${GMOCK_ROOT}
endif
Summary of changes:
po/POTFILES.in | 1 +
po/POTFILES.skip | 4 ++++
src/libqof/qof/Makefile.am | 2 ++
src/libqof/qof/test/Makefile.am | 8 ++++++--
src/test-core/Makefile.am | 4 ++--
5 files changed, 15 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list