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
This commit is contained in:
Geert Janssens 2015-01-16 18:48:52 +01:00
parent 1348d5b92a
commit 98fe336430
5 changed files with 15 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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 \

View File

@ -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