From 1e2fdcd21d5ae90095aaad7144e45e144a457adb Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Wed, 5 Aug 2015 09:01:11 +0200 Subject: [PATCH] other ut/test drivers Makefiles --- src/aspell/Makefile | 13 +++------- src/bincimapmime/Makefile | 30 ++++------------------- src/bincimapmime/trbinc.cc | 2 +- src/common/Makefile | 17 ++++--------- src/index/Makefile | 34 ++++---------------------- src/internfile/Makefile | 17 +++++-------- src/query/Makefile | 49 -------------------------------------- src/rcldb/Makefile | 14 ++++------- src/utils/utmkdefs.mk | 3 +++ 9 files changed, 33 insertions(+), 146 deletions(-) delete mode 100644 src/query/Makefile diff --git a/src/aspell/Makefile b/src/aspell/Makefile index 554cd226..598acfca 100644 --- a/src/aspell/Makefile +++ b/src/aspell/Makefile @@ -1,19 +1,12 @@ -depth = .. -include $(depth)/mk/sysconf - PROGS = rclaspell -SRCS = rclaspell.cpp - -all: depend $(PROGS) librecoll +all: $(PROGS) RCLASPELL_OBJS= trrclaspell.o rclaspell : $(RCLASPELL_OBJS) $(CXX) $(ALL_CXXFLAGS) -o rclaspell $(RCLASPELL_OBJS) \ - $(LIBRECOLL) $(LIBXAPIAN) $(LIBICONV) + $(LIBRECOLL) trrclaspell.o : rclaspell.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_RCLASPELL -c -o trrclaspell.o \ rclaspell.cpp -include $(depth)/mk/commontargets - -include alldeps +include ../utils/utmkdefs.mk diff --git a/src/bincimapmime/Makefile b/src/bincimapmime/Makefile index 1faa5898..218b1d52 100644 --- a/src/bincimapmime/Makefile +++ b/src/bincimapmime/Makefile @@ -1,31 +1,11 @@ -# @(#$Id: Makefile,v 1.6 2006-01-19 12:01:42 dockes Exp $ (C) 2005 J.F.Dockes - -depth = .. -include $(depth)/mk/sysconf - -LIBS = libmime.a PROGS = trbinc - -all: depend $(LIBS) - -SRCS = mime-parsefull.cc mime-parseonlyheader.cc \ - mime-printbody.cc mime.cc \ - convert.cc iodevice.cc iofactory.cc - -OBJS = mime-parsefull.o mime-parseonlyheader.o \ - mime-printbody.o mime.o \ - convert.o iodevice.o iofactory.o - -libmime.a : $(OBJS) - $(AR) ru libmime.a $(OBJS) - -.cc.o: - $(CXX) $(ALL_CXXFLAGS) -c $< +all: $(PROGS) TRBINCOBJS = trbinc.o trbinc: trbinc.o - $(CXX) -o trbinc trbinc.o libmime.a + $(CXX) -o trbinc trbinc.o $(LIBRECOLL) -include $(depth)/mk/commontargets +trbinc.o: trbinc.cc + $(CXX) $(ALL_CXXFLAGS) -c -o trbinc.o trbinc.cc -include alldeps +include ../utils/utmkdefs.mk diff --git a/src/bincimapmime/trbinc.cc b/src/bincimapmime/trbinc.cc index d11c4930..8dcf33bb 100644 --- a/src/bincimapmime/trbinc.cc +++ b/src/bincimapmime/trbinc.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 J.F.Dockes */ +/* Copyright (C) 2006 J.F.Dockes * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/common/Makefile b/src/common/Makefile index cd37018e..b5bb6173 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -1,33 +1,26 @@ -depth = .. -include $(depth)/mk/sysconf -# Only test executables get build in here PROGS = unacpp textsplit rclconfig -all: librecoll $(PROGS) +all: $(PROGS) UNACPP_OBJS= trunacpp.o unacpp : $(UNACPP_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o unacpp $(UNACPP_OBJS) \ - $(LIBRECOLL) $(LIBICONV) + $(CXX) $(ALL_CXXFLAGS) -o unacpp $(UNACPP_OBJS) $(LIBRECOLL) trunacpp.o : unacpp.cpp unacpp.h $(CXX) $(ALL_CXXFLAGS) -DTEST_UNACPP -c -o trunacpp.o unacpp.cpp TEXTSPLIT_OBJS= trtextsplit.o textsplit : $(TEXTSPLIT_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o textsplit $(TEXTSPLIT_OBJS) \ - $(LIBRECOLL) $(LIBICONV) + $(CXX) $(ALL_CXXFLAGS) -o textsplit $(TEXTSPLIT_OBJS) $(LIBRECOLL) trtextsplit.o : textsplit.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_TEXTSPLIT -c -o trtextsplit.o \ textsplit.cpp RCLCONFIG_OBJS= trrclconfig.o rclconfig : $(RCLCONFIG_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o rclconfig $(RCLCONFIG_OBJS) \ - $(LIBRECOLL) $(LIBICONV) $(LIBSYS) + $(CXX) $(ALL_CXXFLAGS) -o rclconfig $(RCLCONFIG_OBJS) $(LIBRECOLL) trrclconfig.o : rclconfig.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_RCLCONFIG -c -o trrclconfig.o \ rclconfig.cpp -include $(depth)/mk/commontargets - +include ../utils/utmkdefs.mk diff --git a/src/index/Makefile b/src/index/Makefile index f6b4e7e1..2c6721b5 100644 --- a/src/index/Makefile +++ b/src/index/Makefile @@ -1,42 +1,18 @@ -depth = .. -include $(depth)/mk/sysconf - -PROGS = recollindex -SRCS = recollindex.cpp rclmonrcv.cpp rclmonprc.cpp - -all: depend librecoll $(PROGS) - -RECOLLINDEX_OBJS= recollindex.o rclmonrcv.o rclmonprc.o -recollindex : $(RECOLLINDEX_OBJS) - $(CXX) $(ALL_CXXFLAGS) $(RECOLL_LDFLAGS) $(LDFLAGS) -o recollindex \ - $(RECOLLINDEX_OBJS) \ - $(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBXAPIANSTATICEXTRA) \ - $(LIBICONV) $(BDYNAMIC) \ - $(LIBFAM) \ - $(X_LIBS) $(X_PRE_LIBS) $(X_LIBX11) $(X_EXTRA_LIBS) \ - $(LIBSYS) $(LIBTHREADS) -recollindex.o : recollindex.cpp - $(CXX) $(ALL_CXXFLAGS) -c -o recollindex.o $< -rclmonrcv.o : rclmonrcv.cpp - $(CXX) $(ALL_CXXFLAGS) -c -o rclmonrcv.o $< -rclmonprc.o : rclmonprc.cpp - $(CXX) $(ALL_CXXFLAGS) -c -o rclmonprc.o $< +PROGS = subtreelist mimetype +all: $(PROGS) SUBTREELIST_OBJS= subtreelist.o subtreelist : $(SUBTREELIST_OBJS) $(CXX) $(ALL_CXXFLAGS) -o subtreelist $(SUBTREELIST_OBJS) \ - $(LIBRECOLL) $(LIBICONV) $(LIBXAPIAN) $(LIBSYS) + $(LIBRECOLL) subtreelist.o : subtreelist.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_SUBTREELIST -c subtreelist.cpp MIMETYPE_OBJS= trmimetype.o mimetype : $(MIMETYPE_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o mimetype $(MIMETYPE_OBJS) \ - $(LIBRECOLL) $(LIBICONV) $(LIBSYS) + $(CXX) $(ALL_CXXFLAGS) -o mimetype $(MIMETYPE_OBJS) $(LIBRECOLL) trmimetype.o : mimetype.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_MIMETYPE -c -o trmimetype.o \ mimetype.cpp -include $(depth)/mk/commontargets - -include alldeps +include ../utils/utmkdefs.mk diff --git a/src/internfile/Makefile b/src/internfile/Makefile index aa6cb90f..8520ef50 100644 --- a/src/internfile/Makefile +++ b/src/internfile/Makefile @@ -1,25 +1,20 @@ -depth = .. -include $(depth)/mk/sysconf - -# Only test executables get build in here PROGS = mh_mbox internfile -all: librecoll $(PROGS) +all: $(PROGS) -INTERNFILE_OBJS= trinternfile.o $(BIGLIB) +INTERNFILE_OBJS= trinternfile.o internfile : $(INTERNFILE_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o internfile $(INTERNFILE_OBJS) \ - $(LIBRECOLL) $(LIBICONV) $(LIBSYS) + $(CXX) $(ALL_CXXFLAGS) -o internfile $(INTERNFILE_OBJS) $(LIBRECOLL) trinternfile.o : internfile.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_INTERNFILE -c -o trinternfile.o \ internfile.cpp MH_MBOX_OBJS= trmh_mbox.o $(BIGLIB) mh_mbox : $(MH_MBOX_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o mh_mbox $(MH_MBOX_OBJS) \ - $(LIBRECOLL) $(LIBICONV) $(LIBSYS) + $(CXX) $(ALL_CXXFLAGS) -o mh_mbox $(MH_MBOX_OBJS) $(LIBRECOLL) trmh_mbox.o : mh_mbox.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_MH_MBOX -c -o trmh_mbox.o \ mh_mbox.cpp -include $(depth)/mk/commontargets +include ../utils/utmkdefs.mk + diff --git a/src/query/Makefile b/src/query/Makefile deleted file mode 100644 index 303a8a11..00000000 --- a/src/query/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -depth = .. -include $(depth)/mk/sysconf - -PROGS = xadump recollq #trhist qtry qxtry -SRCS = xadump.cpp - -all: wasaparse.tab.cpp depend librecoll $(PROGS) - -wasaparse.tab.cpp : wasaparse.y - bison wasaparse.y - mv -f wasaparse.tab.c wasaparse.tab.cpp - -XADUMP_OBJS= xadump.o -xadump : $(XADUMP_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o xadump $(XADUMP_OBJS) \ - $(depth)/lib/librecoll.a $(LIBICONV) $(LIBXAPIAN) $(LIBSYS) -xadump.o : xadump.cpp - $(CXX) $(ALL_CXXFLAGS) -c xadump.cpp - -RECOLLQ_OBJS= recollq.o -recollq : $(RECOLLQ_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o recollq $(RECOLLQ_OBJS) \ - $(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) \ - $(LIBSYS) -recollq.o : recollq.cpp - $(CXX) $(ALL_CXXFLAGS) -DTEST_RECOLLQ -c recollq.cpp - -HISTORY_OBJS= trhist.o -trhist : $(HISTORY_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o trhist $(HISTORY_OBJS) \ - $(LIBICONV) $(LIBXAPIAN) -trhist.o : history.cpp history.h - $(CXX) $(ALL_CXXFLAGS) -DTEST_HISTORY -c -o trhist.o history.cpp - -WASASTRINGTOQUERY_OBJS= trwasastrtoq.o -trwasastrtoq : $(WASASTRINGTOQUERY_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o trwasastrtoq $(WASASTRINGTOQUERY_OBJS) \ - $(LIBRECOLL) $(LIBICONV) $(LIBXAPIAN) -trwasastrtoq.o : wasastringtoquery.cpp wasastringtoquery.h - $(CXX) $(ALL_CXXFLAGS) -DTEST_WASASTRINGTOQUERY -c \ - -o trwasastrtoq.o wasastringtoquery.cpp - -include $(depth)/mk/commontargets - -include alldeps - -distclean:: - -rm -f location.hh position.hh stack.hh \ - wasaparse.tab.c wasaparse.tab.cpp wasaparse.tab.h diff --git a/src/rcldb/Makefile b/src/rcldb/Makefile index bec225fa..20ab6b30 100644 --- a/src/rcldb/Makefile +++ b/src/rcldb/Makefile @@ -1,15 +1,10 @@ -depth = .. -include $(depth)/mk/sysconf - -# Only test executables get build in here PROGS = synfamily stoplist -all: librecoll $(PROGS) +all: $(PROGS) STOPLIST_OBJS= trstoplist.o stoplist : $(STOPLIST_OBJS) - $(CXX) $(ALL_CXXFLAGS) -o stoplist $(STOPLIST_OBJS) \ - $(LIBRECOLL) $(LIBICONV) $(LIBSYS) + $(CXX) $(ALL_CXXFLAGS) -o stoplist $(STOPLIST_OBJS) $(LIBRECOLL) trstoplist.o : stoplist.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_STOPLIST -c -o trstoplist.o \ stoplist.cpp @@ -17,9 +12,10 @@ trstoplist.o : stoplist.cpp SYNFAMILY_OBJS= trsynfamily.o synfamily : $(SYNFAMILY_OBJS) $(CXX) $(ALL_CXXFLAGS) -o synfamily $(SYNFAMILY_OBJS) \ - $(LIBRECOLL) $(LIBICONV) $(LIBXAPIAN) $(LIBSYS) + $(LIBRECOLL) -lxapian + trsynfamily.o : synfamily.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_SYNFAMILY -c -o trsynfamily.o \ synfamily.cpp -include $(depth)/mk/commontargets +include ../utils/utmkdefs.mk diff --git a/src/utils/utmkdefs.mk b/src/utils/utmkdefs.mk index 6874d263..77fbe82f 100644 --- a/src/utils/utmkdefs.mk +++ b/src/utils/utmkdefs.mk @@ -8,3 +8,6 @@ ALL_CXXFLAGS = \ -I../unac \ -I../utils LIBRECOLL = -L../.libs -lrecoll + +clean: + rm -f $(PROGS) *.o