From 1b4f3fa5564005bf99486750e4c5fdd980b0b757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 12 Jul 2018 19:02:11 +0200 Subject: Fix FTBFS for build without cppunit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- kmymoney2/Makefile.am | 3 --- kmymoney2/converter/Makefile.am | 4 ---- kmymoney2/mymoney/Makefile.am | 3 --- kmymoney2/mymoney/storage/Makefile.am | 3 --- kmymoney2/reports/Makefile.am | 2 -- 5 files changed, 15 deletions(-) diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am index 2a83358..e00baab 100644 --- a/kmymoney2/Makefile.am +++ b/kmymoney2/Makefile.am @@ -157,7 +157,6 @@ uninstall-hook: dist-hook: -rm -rf $(distdir)/kmymoneysettings.cpp -if CPPUNIT TESTS = kmymoneytest check_PROGRAMS = kmymoneytest @@ -167,5 +166,3 @@ kmymoneytest_LDADD = ./mymoney/storage/libstoragetest.a ./mymoney/libmymoneytest # the library search path. kmymoneytest_LDFLAGS = $(all_libraries) $(kde_RPATH) $(CPPUNIT_LIBS) $(LIB_TDEUTILS) -endif - diff --git a/kmymoney2/converter/Makefile.am b/kmymoney2/converter/Makefile.am index b54449e..7e6ca11 100644 --- a/kmymoney2/converter/Makefile.am +++ b/kmymoney2/converter/Makefile.am @@ -15,10 +15,6 @@ inst_HEADERS = mymoneytemplate.h noinst_HEADERS = imymoneyreader.h mymoneyqifprofile.h mymoneyqifreader.h mymoneyqifwriter.h mymoneystatementreader.h webpricequote.h mymoneygncreader.h convertertest.h -if CPPUNIT check_LIBRARIES = libconvertertest.a libconvertertest_a_SOURCES = convertertest.cpp -endif - - diff --git a/kmymoney2/mymoney/Makefile.am b/kmymoney2/mymoney/Makefile.am index 84ec924..776502a 100644 --- a/kmymoney2/mymoney/Makefile.am +++ b/kmymoney2/mymoney/Makefile.am @@ -42,9 +42,6 @@ inst_HEADERS = mymoneyobject.h mymoneyaccount.h mymoneycategory.h mymoneyexcepti noinst_HEADERS = autotest.h mymoneyaccounttest.h mymoneyfinancialcalculatortest.h mymoneykeyvaluecontainertest.h mymoneyexceptiontest.h mymoneyfiletest.h mymoneyinstitutiontest.h mymoneymoneytest.h mymoneyobservertest.h mymoneyscheduletest.h mymoneysplittest.h mymoneysecuritytest.h mymoneytransactiontest.h mymoneypricetest.h mymoneyobjecttest.h mymoneyforecasttest.h mymoneypayeetest.h -if CPPUNIT check_LIBRARIES = libmymoneytest.a libmymoneytest_a_SOURCES = mymoneytransactiontest.cpp mymoneysplittest.cpp mymoneymoneytest.cpp mymoneyfiletest.cpp mymoneyaccounttest.cpp mymoneyexceptiontest.cpp mymoneyinstitutiontest.cpp mymoneykeyvaluecontainertest.cpp mymoneyscheduletest.cpp mymoneyfinancialcalculatortest.cpp mymoneysecuritytest.cpp mymoneypricetest.cpp mymoneyobjecttest.cpp mymoneyforecasttest.cpp mymoneypayeetest.cpp -endif - diff --git a/kmymoney2/mymoney/storage/Makefile.am b/kmymoney2/mymoney/storage/Makefile.am index 0055800..85d4664 100644 --- a/kmymoney2/mymoney/storage/Makefile.am +++ b/kmymoney2/mymoney/storage/Makefile.am @@ -12,9 +12,6 @@ inst_HEADERS = imymoneystorage.h imymoneyserialize.h imymoneystorageformat.h noinst_HEADERS = mymoneyseqaccessmgr.h mymoneydatabasemgr.h mymoneystorageanon.h mymoneystoragedump.h mymoneystoragexml.h mymoneyseqaccessmgrtest.h mymoneydatabasemgrtest.h mymoneystoragesql.h mymoneystoragebin.h mymoneymap.h mymoneymaptest.h -if CPPUNIT check_LIBRARIES = libstoragetest.a libstoragetest_a_SOURCES = mymoneyseqaccessmgrtest.cpp mymoneymaptest.cpp mymoneydatabasemgrtest.cpp -endif - diff --git a/kmymoney2/reports/Makefile.am b/kmymoney2/reports/Makefile.am index d6d050f..2cfbb15 100644 --- a/kmymoney2/reports/Makefile.am +++ b/kmymoney2/reports/Makefile.am @@ -9,8 +9,6 @@ libreports_a_SOURCES = pivotgrid.cpp pivottable.cpp listtable.cpp querytable.cpp noinst_HEADERS = kreportchartview.h kreportsviewtest.h pivotgrid.h pivottable.h pivottabletest.h pivotgridtest.h listtable.h querytable.h querytabletest.h objectinfotable.h reportaccount.h reportdebug.h reportstestcommon.h kreportchartview.h reporttable.h -if CPPUNIT check_LIBRARIES = libreportstest.a libreportstest_a_SOURCES = reportstestcommon.cpp pivottabletest.cpp pivotgridtest.cpp querytabletest.cpp -endif -- cgit v1.2.1