tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleaned-up makes

Browse Source
This commit is contained in:
dockes 2005-11-12 11:26:10 +00:00
parent 548a4c1a27
commit 77e0efcb0a
10 changed files with 105 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Makefile
View File

@ -1,21 +1,28 @@
# @(#$Id: Makefile,v 1.11 2005-11-12 11:26:09 dockes Exp $ (C) 2005 J.F.Dockes
# Default values. These can be overridden on the command line ie:
# make PREFIX=/usr
PREFIX=/usr/local PREFIX=/usr/local
INSTALL = install -c INSTALL = install -c
all: mk/sysconf all: mk/sysconf
cd lib; ${MAKE} cd lib; ${MAKE}
cd bincimapmime; ${MAKE} cd bincimapmime; ${MAKE}
cd index; ${MAKE} cd index; rm -f recollindex; ${MAKE} recollindex
cd qtgui; qmake recoll.pro; rm -f recoll; ${MAKE} cd qtgui; qmake recoll.pro; rm -f recoll; \
cat ../mk/commondefs ../mk/sysconf Makefile | ${MAKE} -f -
mk/sysconf: mk/sysconf:
./configure ./configure
static: static:
rm -f index/recollindex qtgui/recoll
cd lib; ${MAKE} cd lib; ${MAKE}
cd bincimapmime; ${MAKE} cd bincimapmime; ${MAKE}
cd index; ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic cd index; rm -f recollindex; \
cd qtgui; qmake recoll.pro; ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
cd qtgui; qmake recoll.pro; rm -f recoll \
cat ../mk/commondefs ../mk/sysconf Makefile | ${MAKE} -f - \
BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
clean: clean:
cd common; ${MAKE} clean cd common; ${MAKE} clean
@ -27,6 +34,9 @@ clean:
@-cd qtgui; ${MAKE} clean @-cd qtgui; ${MAKE} clean
rm -f qtgui/Makefile qtgui/preview/Makefile qtgui/recoll rm -f qtgui/Makefile qtgui/preview/Makefile qtgui/recoll
distclean: clean
rm -f mk/sysconf
install: all install: all
./recollinstall ${PREFIX} ./recollinstall ${PREFIX}

21
src/bincimapmime/Makefile
View File

@ -1,9 +1,8 @@
include ../mk/sysconf
LIBS = libmime.a LIBS = libmime.a
PROGS = trbinc PROGS = trbinc
all: $(LIBS) all: depend $(LIBS)
SRCS = mime-getpart.cc mime-parsefull.cc mime-parseonlyheader.cc \ SRCS = mime-getpart.cc mime-parsefull.cc mime-parseonlyheader.cc \
mime-printbody.cc mime-printdoc.cc mime-printheader.cc mime.cc \ mime-printbody.cc mime-printdoc.cc mime-printheader.cc mime.cc \
@ -14,9 +13,8 @@ OBJS = mime-getpart.o mime-parsefull.o mime-parseonlyheader.o \
convert.o iodevice.o iofactory.o convert.o iodevice.o iofactory.o
libmime.a : $(OBJS) libmime.a : $(OBJS)
ar ru libmime.a $(OBJS) $(AR) ru libmime.a $(OBJS)
# $(CXX) $(CXXFLAGS) -c $<
.cc .o : .cc .o :
$(CXX) $(CXXFLAGS) -c $< $(CXX) $(CXXFLAGS) -c $<
@ -24,10 +22,15 @@ TRBINCOBJS = trbinc.o
trbinc: trbinc.o trbinc: trbinc.o
$(CXX) -o trbinc trbinc.o libmime.a $(CXX) -o trbinc trbinc.o libmime.a
clean: depend: alldeps.stamp
rm -f *.o $(LIBS) alldeps.stamp : $(SRCS)
$(CXX) -M $(CXXFLAGS) $(SRCS) > alldeps
touch alldeps.stamp
depend: alldeps clean:
alldeps: $(SRCS) cp /dev/null alldeps
$(CXX) $(CXXFLAGS) -M $(SRCS) > alldeps rm -f alldeps.stamp
rm -f ${LIBS} ${PROGS} ${OBJS}
include ../mk/sysconf
include alldeps include alldeps

15
src/common/Makefile
View File

@ -1,8 +1,11 @@
include ../mk/sysconf
BIGLIB = ../lib/librcl.a
# Only test progs in there
PROGS = unacpp textsplit PROGS = unacpp textsplit
all: $(PROGS)
all: $(BIGLIB) $(PROGS)
$(BIGLIB):
cd ../lib;$(MAKE)
UNACPP_OBJS= trunacpp.o $(BIGLIB) UNACPP_OBJS= trunacpp.o $(BIGLIB)
unacpp : $(UNACPP_OBJS) unacpp : $(UNACPP_OBJS)
@ -17,5 +20,9 @@ textsplit : $(TEXTSPLIT_OBJS)
trtextsplit.o : textsplit.cpp trtextsplit.o : textsplit.cpp
$(CXX) $(CXXFLAGS) -DTEST_TEXTSPLIT -c -o trtextsplit.o \ $(CXX) $(CXXFLAGS) -DTEST_TEXTSPLIT -c -o trtextsplit.o \
textsplit.cpp textsplit.cpp
clean:
clean::
rm -f *.o $(PROGS) rm -f *.o $(PROGS)
include ../mk/sysconf

28
src/index/Makefile
View File

@ -1,17 +1,14 @@
include ../mk/sysconf
BIGLIB = ../lib/librcl.a
MIMELIB = ../bincimapmime/libmime.a
PROGS = recollindex csguess mimetype PROGS = recollindex csguess mimetype
SRCS = recollindex.cpp
all: $(PROGS) all: $(PROGS)
RECOLLINDEX_OBJS= recollindex.o $(BIGLIB) $(MIMELIB) RECOLLINDEX_OBJS= recollindex.o $(BIGLIB) $(MIMELIB)
recollindex : $(RECOLLINDEX_OBJS) recollindex : $(RECOLLINDEX_OBJS)
$(CXX) $(CXXFLAGS) -o recollindex $(RECOLLINDEX_OBJS) \ $(CXX) $(CXXFLAGS) -o recollindex $(RECOLLINDEX_OBJS) \
$(BSTATIC) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) $(LIBSYS) $(BSTATIC) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) $(LIBSYS)
recollindex.o : idxdriver.cpp recollindex.o : recollindex.cpp
$(CXX) $(CXXFLAGS) -c -o recollindex.o idxdriver.cpp $(CXX) $(CXXFLAGS) -c -o recollindex.o $<
CSGUESS_OBJS= trcsguess.o $(BIGLIB) CSGUESS_OBJS= trcsguess.o $(BIGLIB)
csguess : $(CSGUESS_OBJS) csguess : $(CSGUESS_OBJS)
@ -29,11 +26,20 @@ trmimetype.o : mimetype.cpp
$(CXX) $(CXXFLAGS) -DTEST_MIMETYPE -c -o trmimetype.o \ $(CXX) $(CXXFLAGS) -DTEST_MIMETYPE -c -o trmimetype.o \
mimetype.cpp mimetype.cpp
$(BIGLIB):
cd ../lib;$(MAKE)
$(MIMELIB):
cd ../bincimapmime;$(MAKE)
depend: alldeps.stamp
alldeps.stamp : $(SRCS)
$(CXX) -M $(CXXFLAGS) $(SRCS) > alldeps
touch alldeps.stamp
clean: clean:
cp /dev/null alldeps
rm -f alldeps.stamp
rm -f *.o $(PROGS) rm -f *.o $(PROGS)
alldeps:depend
depend:
$(CXX) $(CXXFLAGS) -M *.cpp > alldeps
include alldeps include alldeps
include ../mk/sysconf

22
src/lib/Makefile
View File

@ -1,10 +1,9 @@
include ../mk/sysconf
UNACCFLAGS = -g -I. -I../unac -I/usr/local/include -DUNAC_VERSION=\"1.0.7\"
UNACCFLAGS = -g -I. -I../unac $(INCICONV) -DUNAC_VERSION=\"1.0.7\"
LIBS = librcl.a LIBS = librcl.a
all: $(LIBS)
all: depend $(LIBS)
OBJS = base64.o conftree.o csguess.o debuglog.o \ OBJS = base64.o conftree.o csguess.o debuglog.o \
execmd.o wipedir.o \ execmd.o wipedir.o \
@ -92,14 +91,15 @@ md5.o : ../utils/md5.cpp
unacpp.o : ../common/unacpp.cpp unacpp.o : ../common/unacpp.cpp
$(CXX) $(CXXFLAGS) -c $< $(CXX) $(CXXFLAGS) -c $<
depend: alldeps.stamp
alldeps.stamp : $(SRCS)
$(CXX) -M $(CXXFLAGS) $(SRCS) > alldeps
touch alldeps.stamp
clean: clean:
rm -f *.o $(LIBS) cp /dev/null alldeps
rm -f alldeps.stamp
depend: alldeps rm -f $(OBJS) $(LIBS)
alldeps: $(SRCS)
$(CXX) $(CXXFLAGS) -M $(SRCS) > alldeps
include alldeps include alldeps
include ../mk/sysconf

11
src/mk/commondefs
View File

@ -1,13 +1,22 @@
#
# Definitions mostly common to all systems, can be overridden by # Definitions mostly common to all systems, can be overridden by
# sys-specific include # sys-specific include
COMMONCXXFLAGS = -Wall -Wno-unused -g -I. -I../index -I../utils -I../common \ COMMONCXXFLAGS = -Wall -Wno-unused -g -I. -I../index -I../utils -I../common \
-I../unac -I../bincimapmime -I/usr/local/include -I../unac -I../bincimapmime -I/usr/local/include
LIBXAPIAN = -L/usr/local/lib -lxapian LIBXAPIAN = -L/usr/local/lib -lxapian
LIBICONV = -L/usr/local/lib -liconv
INCICONV = -I/usr/local/include
BIGLIB = ../lib/librcl.a BIGLIB = ../lib/librcl.a
MIMELIB = ../bincimapmime/libmime.a MIMELIB = ../bincimapmime/libmime.a
RANLIB = test -f RANLIB = test -f
AR=ar
INSTALL = install -c INSTALL = install -c
#QTDIR = /usr

4
src/qtgui/recoll.pro
View File

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
LANGUAGE = C++ LANGUAGE = C++
CONFIG += qt warn_on thread release CONFIG += qt warn_on thread release #debug
SOURCES += main.cpp \ SOURCES += main.cpp \
idxthread.cpp \ idxthread.cpp \
@ -27,7 +27,7 @@ unix {
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj OBJECTS_DIR = .obj
LIBS += ../lib/librcl.a ../bincimapmime/libmime.a \ LIBS += ../lib/librcl.a ../bincimapmime/libmime.a \
$(BSTATIC) -L/usr/local/lib -lxapian -liconv $(BDYNAMIC) \ $(BSTATIC) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) \
-lz -lz
INCLUDEPATH += ../common ../index ../query ../unac ../utils INCLUDEPATH += ../common ../index ../query ../unac ../utils

20
src/query/Makefile
View File

@ -1,6 +1,3 @@
include ../mk/sysconf
BIGLIB=../lib/librcl.a
PROGS = qtry qxtry xadump PROGS = qtry qxtry xadump
all: $(PROGS) all: $(PROGS)
@ -23,10 +20,15 @@ qtry : $(QTRY_OBJS)
$(BIGLIB): $(BIGLIB):
cd ../lib;make cd ../lib;make
clean: depend: alldeps.stamp
rm -f *.o $(PROGS) alldeps.stamp : $(SRCS)
alldeps:depend $(CXX) -M $(CXXFLAGS) $(SRCS) > alldeps
depend: touch alldeps.stamp
$(CXX) $(CXXFLAGS) -M *.cpp > alldeps
include alldeps
clean:
cp /dev/null alldeps
rm -f alldeps.stamp
rm -f *.o $(PROGS)
include ../mk/sysconf
include alldeps

9
src/sampleconf/mimemap
View File

@ -1,4 +1,4 @@
# @(#$Id: mimemap,v 1.7 2005-11-10 08:46:14 dockes Exp $ (C) 2004 J.F.Dockes # @(#$Id: mimemap,v 1.8 2005-11-12 11:26:10 dockes Exp $ (C) 2004 J.F.Dockes
# Recoll: associations of file name extensions to mime types # Recoll: associations of file name extensions to mime types
.txt = text/plain .txt = text/plain
@ -23,17 +23,22 @@
.doc = application/msword .doc = application/msword
# OpenOffice / opendocument. We handle opendocument as old openoffice files
# for now
.sxc = application/vnd.sun.xml.calc .sxc = application/vnd.sun.xml.calc
.ods = application/vnd.sun.xml.calc
.stc = application/vnd.sun.xml.calc.template .stc = application/vnd.sun.xml.calc.template
.sxd = application/vnd.sun.xml.draw .sxd = application/vnd.sun.xml.draw
.std = application/vnd.sun.xml.draw.template .std = application/vnd.sun.xml.draw.template
.sxi = application/vnd.sun.xml.impress .sxi = application/vnd.sun.xml.impress
.odp = application/vnd.sun.xml.impress
.sti = application/vnd.sun.xml.impress.template .sti = application/vnd.sun.xml.impress.template
.sxm = application/vnd.sun.xml.math .sxm = application/vnd.sun.xml.math
.sxw = application/vnd.sun.xml.writer .sxw = application/vnd.sun.xml.writer
.odt = application/vnd.sun.xml.writer
.sxg = application/vnd.sun.xml.writer.global .sxg = application/vnd.sun.xml.writer.global
.stw = application/vnd.sun.xml.writer.template .stw = application/vnd.sun.xml.writer.template
.odt = application/vnd.sun.xml.writer
.wpd = application/vnd.wordperfect .wpd = application/vnd.wordperfect
.rtf = text/rtf .rtf = text/rtf

13
src/utils/Makefile
View File

@ -1,11 +1,11 @@
include ../mk/sysconf
BIGLIB = ../lib/librcl.a
PROGS = trconftree wipedir smallut trfstreewalk trpathut transcode \ PROGS = trconftree wipedir smallut trfstreewalk trpathut transcode \
trmimeparse trexecmd utf8iter idfile trmimeparse trexecmd utf8iter idfile
all: $(PROGS) all: $(PROGS) $(BIGLIB)
$(BIGLIB):
cd ../lib;$(MAKE)
FSTREEWALK_OBJS= trfstreewalk.o fstreewalk.o pathut.o FSTREEWALK_OBJS= trfstreewalk.o fstreewalk.o pathut.o
trfstreewalk : $(FSTREEWALK_OBJS) trfstreewalk : $(FSTREEWALK_OBJS)
@ -69,7 +69,6 @@ trutf8iter.o : ../utils/utf8iter.cpp utf8iter.h
utf8iter.cpp utf8iter.cpp
CONFTREE_OBJS= trconftree.o $(BIGLIB) CONFTREE_OBJS= trconftree.o $(BIGLIB)
trconftree : $(CONFTREE_OBJS) trconftree : $(CONFTREE_OBJS)
$(CXX) $(CXXFLAGS) -o trconftree $(CONFTREE_OBJS) $(CXX) $(CXXFLAGS) -o trconftree $(CONFTREE_OBJS)
@ -77,7 +76,7 @@ trconftree.o : ../utils/conftree.cpp
$(CXX) $(CXXFLAGS) -DTEST_CONFTREE -c -o trconftree.o \ $(CXX) $(CXXFLAGS) -DTEST_CONFTREE -c -o trconftree.o \
conftree.cpp conftree.cpp
clean: clean:
rm -f *.o $(PROGS) rm -f *.o $(PROGS)
include ../mk/sysconf