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

distributed files from common/ into rcld, internfile, common

Browse Source
This commit is contained in:
dockes 2006-11-15 14:57:53 +00:00
parent 428730348b
commit e0c87881ea
10 changed files with 237 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/Makefile
View File

@ -1,4 +1,4 @@
# @(#$Id: Makefile,v 1.12 2006-09-21 05:57:45 dockes Exp $ (C) 2005 J.F.Dockes # @(#$Id: Makefile,v 1.13 2006-11-15 14:57:53 dockes Exp $ (C) 2005 J.F.Dockes
depth = .. depth = ..
include $(depth)/mk/sysconf include $(depth)/mk/sysconf
@ -25,14 +25,6 @@ trtextsplit.o : textsplit.cpp
$(CXX) $(ALL_CXXFLAGS) -DTEST_TEXTSPLIT -c -o trtextsplit.o \ $(CXX) $(ALL_CXXFLAGS) -DTEST_TEXTSPLIT -c -o trtextsplit.o \
textsplit.cpp textsplit.cpp
INTERNFILE_OBJS= trinternfile.o $(BIGLIB) $(MIMELIB)
internfile : $(INTERNFILE_OBJS)
$(CXX) $(ALL_CXXFLAGS) -o internfile $(INTERNFILE_OBJS) \
$(LIBICONV) $(LIBSYS)
trinternfile.o : internfile.cpp
$(CXX) $(ALL_CXXFLAGS) -DTEST_INTERNFILE -c -o trinternfile.o \
internfile.cpp
RCLCONFIG_OBJS= trrclconfig.o $(BIGLIB) $(MIMELIB) RCLCONFIG_OBJS= trrclconfig.o $(BIGLIB) $(MIMELIB)
rclconfig : $(RCLCONFIG_OBJS) rclconfig : $(RCLCONFIG_OBJS)
$(CXX) $(ALL_CXXFLAGS) -o rclconfig $(RCLCONFIG_OBJS) \ $(CXX) $(ALL_CXXFLAGS) -o rclconfig $(RCLCONFIG_OBJS) \

322
src/lib/Makefile
View File

@ -8,8 +8,8 @@ LIBS = librcl.a
all: $(LIBS) all: $(LIBS)
OBJS = conftree.o csguess.o debuglog.o execmd.o idfile.o md5.o wipedir.o fstreewalk.o mh_html.o mh_mail.o searchdata.o mh_exec.o mh_text.o htmlparse.o indexer.o internfile.o mimehandler.o mimeparse.o mimetype.o myhtmlparse.o pathhash.o pathut.o rclconfig.o rcldb.o rclinit.o stemdb.o base64.o readfile.o smallut.o textsplit.o transcode.o unacpp.o history.o docseq.o sortseq.o copyfile.o rclaspell.o OBJS = rclaspell.o rclconfig.o rclinit.o textsplit.o unacpp.o csguess.o indexer.o mimetype.o htmlparse.o internfile.o mh_exec.o mh_html.o mh_mail.o mh_text.o mimehandler.o myhtmlparse.o docseq.o history.o sortseq.o pathhash.o rcldb.o searchdata.o stemdb.o base64.o conftree.o copyfile.o debuglog.o execmd.o fstreewalk.o idfile.o md5.o mimeparse.o pathut.o readfile.o smallut.o transcode.o wipedir.o
DEPS = conftree.dep.stamp csguess.dep.stamp debuglog.dep.stamp execmd.dep.stamp idfile.dep.stamp md5.dep.stamp wipedir.dep.stamp fstreewalk.dep.stamp mh_html.dep.stamp mh_mail.dep.stamp searchdata.dep.stamp mh_exec.dep.stamp mh_text.dep.stamp htmlparse.dep.stamp indexer.dep.stamp internfile.dep.stamp mimehandler.dep.stamp mimeparse.dep.stamp mimetype.dep.stamp myhtmlparse.dep.stamp pathhash.dep.stamp pathut.dep.stamp rclconfig.dep.stamp rcldb.dep.stamp rclinit.dep.stamp stemdb.dep.stamp base64.dep.stamp readfile.dep.stamp smallut.dep.stamp textsplit.dep.stamp transcode.dep.stamp unacpp.dep.stamp history.dep.stamp docseq.dep.stamp sortseq.dep.stamp copyfile.dep.stamp rclaspell.dep.stamp DEPS = rclaspell.dep.stamp rclconfig.dep.stamp rclinit.dep.stamp textsplit.dep.stamp unacpp.dep.stamp csguess.dep.stamp indexer.dep.stamp mimetype.dep.stamp htmlparse.dep.stamp internfile.dep.stamp mh_exec.dep.stamp mh_html.dep.stamp mh_mail.dep.stamp mh_text.dep.stamp mimehandler.dep.stamp myhtmlparse.dep.stamp docseq.dep.stamp history.dep.stamp sortseq.dep.stamp pathhash.dep.stamp rcldb.dep.stamp searchdata.dep.stamp stemdb.dep.stamp base64.dep.stamp conftree.dep.stamp copyfile.dep.stamp debuglog.dep.stamp execmd.dep.stamp fstreewalk.dep.stamp idfile.dep.stamp md5.dep.stamp mimeparse.dep.stamp pathut.dep.stamp readfile.dep.stamp smallut.dep.stamp transcode.dep.stamp wipedir.dep.stamp
librcl.a : $(DEPS) $(OBJS) unac.o librcl.a : $(DEPS) $(OBJS) unac.o
ar ru librcl.a $(OBJS) unac.o ar ru librcl.a $(OBJS) unac.o
@ -17,231 +17,231 @@ librcl.a : $(DEPS) $(OBJS) unac.o
unac.o : $(depth)/unac/unac.c $(depth)/unac/unac.h unac.o : $(depth)/unac/unac.c $(depth)/unac/unac.h
$(CC) $(UNACCFLAGS) -c $(depth)/unac/unac.c $(CC) $(UNACCFLAGS) -c $(depth)/unac/unac.c
conftree.o : ../utils/conftree.cpp rclaspell.o : ../aspell/rclaspell.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/conftree.cpp $(CXX) $(ALL_CXXFLAGS) -c ../aspell/rclaspell.cpp
rclconfig.o : ../common/rclconfig.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/rclconfig.cpp
rclinit.o : ../common/rclinit.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/rclinit.cpp
textsplit.o : ../common/textsplit.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/textsplit.cpp
unacpp.o : ../common/unacpp.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/unacpp.cpp
csguess.o : ../index/csguess.cpp csguess.o : ../index/csguess.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../index/csguess.cpp $(CXX) $(ALL_CXXFLAGS) -c ../index/csguess.cpp
indexer.o : ../index/indexer.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../index/indexer.cpp
mimetype.o : ../index/mimetype.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../index/mimetype.cpp
htmlparse.o : ../internfile/htmlparse.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../internfile/htmlparse.cpp
internfile.o : ../internfile/internfile.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../internfile/internfile.cpp
mh_exec.o : ../internfile/mh_exec.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../internfile/mh_exec.cpp
mh_html.o : ../internfile/mh_html.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../internfile/mh_html.cpp
mh_mail.o : ../internfile/mh_mail.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../internfile/mh_mail.cpp
mh_text.o : ../internfile/mh_text.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../internfile/mh_text.cpp
mimehandler.o : ../internfile/mimehandler.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../internfile/mimehandler.cpp
myhtmlparse.o : ../internfile/myhtmlparse.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../internfile/myhtmlparse.cpp
docseq.o : ../query/docseq.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/docseq.cpp
history.o : ../query/history.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/history.cpp
sortseq.o : ../query/sortseq.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/sortseq.cpp
pathhash.o : ../rcldb/pathhash.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../rcldb/pathhash.cpp
rcldb.o : ../rcldb/rcldb.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../rcldb/rcldb.cpp
searchdata.o : ../rcldb/searchdata.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../rcldb/searchdata.cpp
stemdb.o : ../rcldb/stemdb.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../rcldb/stemdb.cpp
base64.o : ../utils/base64.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/base64.cpp
conftree.o : ../utils/conftree.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/conftree.cpp
copyfile.o : ../utils/copyfile.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/copyfile.cpp
debuglog.o : ../utils/debuglog.cpp debuglog.o : ../utils/debuglog.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/debuglog.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/debuglog.cpp
execmd.o : ../utils/execmd.cpp execmd.o : ../utils/execmd.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/execmd.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/execmd.cpp
fstreewalk.o : ../utils/fstreewalk.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/fstreewalk.cpp
idfile.o : ../utils/idfile.cpp idfile.o : ../utils/idfile.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/idfile.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/idfile.cpp
md5.o : ../utils/md5.cpp md5.o : ../utils/md5.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/md5.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/md5.cpp
wipedir.o : ../utils/wipedir.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/wipedir.cpp
fstreewalk.o : ../utils/fstreewalk.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/fstreewalk.cpp
mh_html.o : ../common/mh_html.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/mh_html.cpp
mh_mail.o : ../common/mh_mail.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/mh_mail.cpp
searchdata.o : ../common/searchdata.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/searchdata.cpp
mh_exec.o : ../common/mh_exec.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/mh_exec.cpp
mh_text.o : ../common/mh_text.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/mh_text.cpp
htmlparse.o : ../common/htmlparse.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/htmlparse.cpp
indexer.o : ../index/indexer.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../index/indexer.cpp
internfile.o : ../common/internfile.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/internfile.cpp
mimehandler.o : ../common/mimehandler.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/mimehandler.cpp
mimeparse.o : ../utils/mimeparse.cpp mimeparse.o : ../utils/mimeparse.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/mimeparse.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/mimeparse.cpp
mimetype.o : ../index/mimetype.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../index/mimetype.cpp
myhtmlparse.o : ../common/myhtmlparse.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/myhtmlparse.cpp
pathhash.o : ../common/pathhash.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/pathhash.cpp
pathut.o : ../utils/pathut.cpp pathut.o : ../utils/pathut.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/pathut.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/pathut.cpp
rclconfig.o : ../common/rclconfig.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/rclconfig.cpp
rcldb.o : ../common/rcldb.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/rcldb.cpp
rclinit.o : ../common/rclinit.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/rclinit.cpp
stemdb.o : ../common/stemdb.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/stemdb.cpp
base64.o : ../utils/base64.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/base64.cpp
readfile.o : ../utils/readfile.cpp readfile.o : ../utils/readfile.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/readfile.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/readfile.cpp
smallut.o : ../utils/smallut.cpp smallut.o : ../utils/smallut.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/smallut.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/smallut.cpp
textsplit.o : ../common/textsplit.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/textsplit.cpp
transcode.o : ../utils/transcode.cpp transcode.o : ../utils/transcode.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/transcode.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/transcode.cpp
unacpp.o : ../common/unacpp.cpp wipedir.o : ../utils/wipedir.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../common/unacpp.cpp $(CXX) $(ALL_CXXFLAGS) -c ../utils/wipedir.cpp
history.o : ../query/history.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/history.cpp
docseq.o : ../query/docseq.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/docseq.cpp
sortseq.o : ../query/sortseq.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/sortseq.cpp
copyfile.o : ../utils/copyfile.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../utils/copyfile.cpp
rclaspell.o : ../aspell/rclaspell.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../aspell/rclaspell.cpp
depend: $(DEPS) depend: $(DEPS)
clean: clean:
rm -f $(OBJS) $(LIBS) $(DEPS) unac.o rm -f $(OBJS) $(LIBS) $(DEPS) unac.o
for i in *.dep;do test -f $$i && cp /dev/null $$i;done for i in *.dep;do test -f $$i && cp /dev/null $$i;done
distclean: clean distclean: clean
rm -f *.dep rm -f *.dep
conftree.dep.stamp : ../utils/conftree.cpp rclaspell.dep.stamp : ../aspell/rclaspell.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/conftree.cpp > conftree.dep $(CXX) -M $(ALL_CXXFLAGS) ../aspell/rclaspell.cpp > rclaspell.dep
touch conftree.dep.stamp touch rclaspell.dep.stamp
rclconfig.dep.stamp : ../common/rclconfig.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/rclconfig.cpp > rclconfig.dep
touch rclconfig.dep.stamp
rclinit.dep.stamp : ../common/rclinit.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/rclinit.cpp > rclinit.dep
touch rclinit.dep.stamp
textsplit.dep.stamp : ../common/textsplit.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/textsplit.cpp > textsplit.dep
touch textsplit.dep.stamp
unacpp.dep.stamp : ../common/unacpp.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/unacpp.cpp > unacpp.dep
touch unacpp.dep.stamp
csguess.dep.stamp : ../index/csguess.cpp csguess.dep.stamp : ../index/csguess.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../index/csguess.cpp > csguess.dep $(CXX) -M $(ALL_CXXFLAGS) ../index/csguess.cpp > csguess.dep
touch csguess.dep.stamp touch csguess.dep.stamp
indexer.dep.stamp : ../index/indexer.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../index/indexer.cpp > indexer.dep
touch indexer.dep.stamp
mimetype.dep.stamp : ../index/mimetype.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../index/mimetype.cpp > mimetype.dep
touch mimetype.dep.stamp
htmlparse.dep.stamp : ../internfile/htmlparse.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../internfile/htmlparse.cpp > htmlparse.dep
touch htmlparse.dep.stamp
internfile.dep.stamp : ../internfile/internfile.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../internfile/internfile.cpp > internfile.dep
touch internfile.dep.stamp
mh_exec.dep.stamp : ../internfile/mh_exec.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../internfile/mh_exec.cpp > mh_exec.dep
touch mh_exec.dep.stamp
mh_html.dep.stamp : ../internfile/mh_html.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../internfile/mh_html.cpp > mh_html.dep
touch mh_html.dep.stamp
mh_mail.dep.stamp : ../internfile/mh_mail.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../internfile/mh_mail.cpp > mh_mail.dep
touch mh_mail.dep.stamp
mh_text.dep.stamp : ../internfile/mh_text.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../internfile/mh_text.cpp > mh_text.dep
touch mh_text.dep.stamp
mimehandler.dep.stamp : ../internfile/mimehandler.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../internfile/mimehandler.cpp > mimehandler.dep
touch mimehandler.dep.stamp
myhtmlparse.dep.stamp : ../internfile/myhtmlparse.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../internfile/myhtmlparse.cpp > myhtmlparse.dep
touch myhtmlparse.dep.stamp
docseq.dep.stamp : ../query/docseq.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../query/docseq.cpp > docseq.dep
touch docseq.dep.stamp
history.dep.stamp : ../query/history.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../query/history.cpp > history.dep
touch history.dep.stamp
sortseq.dep.stamp : ../query/sortseq.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../query/sortseq.cpp > sortseq.dep
touch sortseq.dep.stamp
pathhash.dep.stamp : ../rcldb/pathhash.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../rcldb/pathhash.cpp > pathhash.dep
touch pathhash.dep.stamp
rcldb.dep.stamp : ../rcldb/rcldb.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../rcldb/rcldb.cpp > rcldb.dep
touch rcldb.dep.stamp
searchdata.dep.stamp : ../rcldb/searchdata.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../rcldb/searchdata.cpp > searchdata.dep
touch searchdata.dep.stamp
stemdb.dep.stamp : ../rcldb/stemdb.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../rcldb/stemdb.cpp > stemdb.dep
touch stemdb.dep.stamp
base64.dep.stamp : ../utils/base64.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/base64.cpp > base64.dep
touch base64.dep.stamp
conftree.dep.stamp : ../utils/conftree.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/conftree.cpp > conftree.dep
touch conftree.dep.stamp
copyfile.dep.stamp : ../utils/copyfile.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/copyfile.cpp > copyfile.dep
touch copyfile.dep.stamp
debuglog.dep.stamp : ../utils/debuglog.cpp debuglog.dep.stamp : ../utils/debuglog.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/debuglog.cpp > debuglog.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/debuglog.cpp > debuglog.dep
touch debuglog.dep.stamp touch debuglog.dep.stamp
execmd.dep.stamp : ../utils/execmd.cpp execmd.dep.stamp : ../utils/execmd.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/execmd.cpp > execmd.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/execmd.cpp > execmd.dep
touch execmd.dep.stamp touch execmd.dep.stamp
fstreewalk.dep.stamp : ../utils/fstreewalk.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/fstreewalk.cpp > fstreewalk.dep
touch fstreewalk.dep.stamp
idfile.dep.stamp : ../utils/idfile.cpp idfile.dep.stamp : ../utils/idfile.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/idfile.cpp > idfile.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/idfile.cpp > idfile.dep
touch idfile.dep.stamp touch idfile.dep.stamp
md5.dep.stamp : ../utils/md5.cpp md5.dep.stamp : ../utils/md5.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/md5.cpp > md5.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/md5.cpp > md5.dep
touch md5.dep.stamp touch md5.dep.stamp
wipedir.dep.stamp : ../utils/wipedir.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/wipedir.cpp > wipedir.dep
touch wipedir.dep.stamp
fstreewalk.dep.stamp : ../utils/fstreewalk.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/fstreewalk.cpp > fstreewalk.dep
touch fstreewalk.dep.stamp
mh_html.dep.stamp : ../common/mh_html.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/mh_html.cpp > mh_html.dep
touch mh_html.dep.stamp
mh_mail.dep.stamp : ../common/mh_mail.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/mh_mail.cpp > mh_mail.dep
touch mh_mail.dep.stamp
searchdata.dep.stamp : ../common/searchdata.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/searchdata.cpp > searchdata.dep
touch searchdata.dep.stamp
mh_exec.dep.stamp : ../common/mh_exec.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/mh_exec.cpp > mh_exec.dep
touch mh_exec.dep.stamp
mh_text.dep.stamp : ../common/mh_text.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/mh_text.cpp > mh_text.dep
touch mh_text.dep.stamp
htmlparse.dep.stamp : ../common/htmlparse.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/htmlparse.cpp > htmlparse.dep
touch htmlparse.dep.stamp
indexer.dep.stamp : ../index/indexer.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../index/indexer.cpp > indexer.dep
touch indexer.dep.stamp
internfile.dep.stamp : ../common/internfile.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/internfile.cpp > internfile.dep
touch internfile.dep.stamp
mimehandler.dep.stamp : ../common/mimehandler.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/mimehandler.cpp > mimehandler.dep
touch mimehandler.dep.stamp
mimeparse.dep.stamp : ../utils/mimeparse.cpp mimeparse.dep.stamp : ../utils/mimeparse.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/mimeparse.cpp > mimeparse.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/mimeparse.cpp > mimeparse.dep
touch mimeparse.dep.stamp touch mimeparse.dep.stamp
mimetype.dep.stamp : ../index/mimetype.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../index/mimetype.cpp > mimetype.dep
touch mimetype.dep.stamp
myhtmlparse.dep.stamp : ../common/myhtmlparse.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/myhtmlparse.cpp > myhtmlparse.dep
touch myhtmlparse.dep.stamp
pathhash.dep.stamp : ../common/pathhash.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/pathhash.cpp > pathhash.dep
touch pathhash.dep.stamp
pathut.dep.stamp : ../utils/pathut.cpp pathut.dep.stamp : ../utils/pathut.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/pathut.cpp > pathut.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/pathut.cpp > pathut.dep
touch pathut.dep.stamp touch pathut.dep.stamp
rclconfig.dep.stamp : ../common/rclconfig.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/rclconfig.cpp > rclconfig.dep
touch rclconfig.dep.stamp
rcldb.dep.stamp : ../common/rcldb.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/rcldb.cpp > rcldb.dep
touch rcldb.dep.stamp
rclinit.dep.stamp : ../common/rclinit.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/rclinit.cpp > rclinit.dep
touch rclinit.dep.stamp
stemdb.dep.stamp : ../common/stemdb.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/stemdb.cpp > stemdb.dep
touch stemdb.dep.stamp
base64.dep.stamp : ../utils/base64.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/base64.cpp > base64.dep
touch base64.dep.stamp
readfile.dep.stamp : ../utils/readfile.cpp readfile.dep.stamp : ../utils/readfile.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/readfile.cpp > readfile.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/readfile.cpp > readfile.dep
touch readfile.dep.stamp touch readfile.dep.stamp
smallut.dep.stamp : ../utils/smallut.cpp smallut.dep.stamp : ../utils/smallut.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/smallut.cpp > smallut.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/smallut.cpp > smallut.dep
touch smallut.dep.stamp touch smallut.dep.stamp
textsplit.dep.stamp : ../common/textsplit.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/textsplit.cpp > textsplit.dep
touch textsplit.dep.stamp
transcode.dep.stamp : ../utils/transcode.cpp transcode.dep.stamp : ../utils/transcode.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/transcode.cpp > transcode.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/transcode.cpp > transcode.dep
touch transcode.dep.stamp touch transcode.dep.stamp
unacpp.dep.stamp : ../common/unacpp.cpp wipedir.dep.stamp : ../utils/wipedir.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../common/unacpp.cpp > unacpp.dep $(CXX) -M $(ALL_CXXFLAGS) ../utils/wipedir.cpp > wipedir.dep
touch unacpp.dep.stamp touch wipedir.dep.stamp
history.dep.stamp : ../query/history.cpp include rclaspell.dep
$(CXX) -M $(ALL_CXXFLAGS) ../query/history.cpp > history.dep include rclconfig.dep
touch history.dep.stamp include rclinit.dep
docseq.dep.stamp : ../query/docseq.cpp include textsplit.dep
$(CXX) -M $(ALL_CXXFLAGS) ../query/docseq.cpp > docseq.dep include unacpp.dep
touch docseq.dep.stamp
sortseq.dep.stamp : ../query/sortseq.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../query/sortseq.cpp > sortseq.dep
touch sortseq.dep.stamp
copyfile.dep.stamp : ../utils/copyfile.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../utils/copyfile.cpp > copyfile.dep
touch copyfile.dep.stamp
rclaspell.dep.stamp : ../aspell/rclaspell.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../aspell/rclaspell.cpp > rclaspell.dep
touch rclaspell.dep.stamp
include conftree.dep
include csguess.dep include csguess.dep
include debuglog.dep include indexer.dep
include execmd.dep include mimetype.dep
include idfile.dep include htmlparse.dep
include md5.dep include internfile.dep
include wipedir.dep include mh_exec.dep
include fstreewalk.dep
include mh_html.dep include mh_html.dep
include mh_mail.dep include mh_mail.dep
include searchdata.dep
include mh_exec.dep
include mh_text.dep include mh_text.dep
include htmlparse.dep
include indexer.dep
include internfile.dep
include mimehandler.dep include mimehandler.dep
include mimeparse.dep
include mimetype.dep
include myhtmlparse.dep include myhtmlparse.dep
include docseq.dep
include history.dep
include sortseq.dep
include pathhash.dep include pathhash.dep
include pathut.dep
include rclconfig.dep
include rcldb.dep include rcldb.dep
include rclinit.dep include searchdata.dep
include stemdb.dep include stemdb.dep
include base64.dep include base64.dep
include conftree.dep
include copyfile.dep
include debuglog.dep
include execmd.dep
include fstreewalk.dep
include idfile.dep
include md5.dep
include mimeparse.dep
include pathut.dep
include readfile.dep include readfile.dep
include smallut.dep include smallut.dep
include textsplit.dep
include transcode.dep include transcode.dep
include unacpp.dep include wipedir.dep
include history.dep
include docseq.dep
include sortseq.dep
include copyfile.dep
include rclaspell.dep

59
src/lib/mkMake
View File

@ -3,26 +3,45 @@
mk=Makefile mk=Makefile
depth=.. depth=..
SRCS="${depth}/utils/conftree.cpp ${depth}/index/csguess.cpp \ SRCS="\
${depth}/utils/debuglog.cpp ${depth}/utils/execmd.cpp \ ${depth}/aspell/rclaspell.cpp \
${depth}/utils/idfile.cpp ${depth}/utils/md5.cpp \ ${depth}/common/rclconfig.cpp \
${depth}/utils/wipedir.cpp ${depth}/utils/fstreewalk.cpp \ ${depth}/common/rclinit.cpp \
${depth}/common/mh_html.cpp ${depth}/common/mh_mail.cpp \ ${depth}/common/textsplit.cpp \
${depth}/common/searchdata.cpp \ ${depth}/common/unacpp.cpp \
${depth}/common/mh_exec.cpp ${depth}/common/mh_text.cpp \ ${depth}/index/csguess.cpp \
${depth}/common/htmlparse.cpp ${depth}/index/indexer.cpp \ ${depth}/index/indexer.cpp \
${depth}/common/internfile.cpp ${depth}/common/mimehandler.cpp \ ${depth}/index/mimetype.cpp \
${depth}/utils/mimeparse.cpp ${depth}/index/mimetype.cpp \ ${depth}/internfile/htmlparse.cpp \
${depth}/common/myhtmlparse.cpp ${depth}/common/pathhash.cpp \ ${depth}/internfile/internfile.cpp \
${depth}/utils/pathut.cpp ${depth}/common/rclconfig.cpp \ ${depth}/internfile/mh_exec.cpp \
${depth}/common/rcldb.cpp ${depth}/common/rclinit.cpp \ ${depth}/internfile/mh_html.cpp \
${depth}/common/stemdb.cpp \ ${depth}/internfile/mh_mail.cpp \
${depth}/utils/base64.cpp ${depth}/utils/readfile.cpp \ ${depth}/internfile/mh_text.cpp \
${depth}/utils/smallut.cpp ${depth}/common/textsplit.cpp \ ${depth}/internfile/mimehandler.cpp \
${depth}/utils/transcode.cpp ${depth}/common/unacpp.cpp \ ${depth}/internfile/myhtmlparse.cpp \
${depth}/query/history.cpp \ ${depth}/query/docseq.cpp \
${depth}/query/docseq.cpp ${depth}/query/sortseq.cpp \ ${depth}/query/history.cpp \
${depth}/utils/copyfile.cpp ${depth}/aspell/rclaspell.cpp" ${depth}/query/sortseq.cpp \
${depth}/rcldb/pathhash.cpp \
${depth}/rcldb/rcldb.cpp \
${depth}/rcldb/searchdata.cpp \
${depth}/rcldb/stemdb.cpp \
${depth}/utils/base64.cpp \
${depth}/utils/conftree.cpp \
${depth}/utils/copyfile.cpp \
${depth}/utils/debuglog.cpp \
${depth}/utils/execmd.cpp \
${depth}/utils/fstreewalk.cpp \
${depth}/utils/idfile.cpp \
${depth}/utils/md5.cpp \
${depth}/utils/mimeparse.cpp \
${depth}/utils/pathut.cpp \
${depth}/utils/readfile.cpp \
${depth}/utils/smallut.cpp \
${depth}/utils/transcode.cpp \
${depth}/utils/wipedir.cpp \
"
for c in $SRCS;do for c in $SRCS;do

12
src/mk/commondefs
View File

@ -1,9 +1,15 @@
# Common/default for all systems, can be overridden by sys-specific include # Common/default for all systems, can be overridden by sys-specific include
COMMONCXXFLAGS = -I. -I$(depth)/index \ COMMONCXXFLAGS = -I. \
-I$(depth)/utils -I$(depth)/common \ -I$(depth)/aspell \
-I$(depth)/unac -I$(depth)/bincimapmime -I$(depth)/aspell \ -I$(depth)/bincimapmime \
-I$(depth)/common \
-I$(depth)/index \
-I$(depth)/internfile \
-I$(depth)/rcldb \
-I$(depth)/unac \
-I$(depth)/utils \
-I/usr/local/include -I/usr/local/include
# We happen to be using gcc on all platforms for now. Can be overridden in # We happen to be using gcc on all platforms for now. Can be overridden in

3
src/qtgui/recoll.pro.in
View File

@ -59,7 +59,8 @@ unix {
$(BSTATIC) @LIBXAPIAN@ @LIBICONV@ $(BDYNAMIC) \ $(BSTATIC) @LIBXAPIAN@ @LIBICONV@ $(BDYNAMIC) \
-lz -lz
INCLUDEPATH += ../common ../index ../query ../unac ../utils ../aspell INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
../utils ../aspell ../rcldb
POST_TARGETDEPS = ../lib/librcl.a POST_TARGETDEPS = ../lib/librcl.a
} }

6
src/rcldb/pathhash.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: pathhash.cpp,v 1.3 2006-01-23 13:32:28 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: pathhash.cpp,v 1.4 2006-11-15 14:57:53 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -26,6 +26,7 @@ static char rcsid[] = "@(#$Id: pathhash.cpp,v 1.3 2006-01-23 13:32:28 dockes Exp
#ifndef NO_NAMESPACES #ifndef NO_NAMESPACES
using std::string; using std::string;
namespace Rcl {
#endif /* NO_NAMESPACES */ #endif /* NO_NAMESPACES */
#ifdef PATHHASH_HEX #ifdef PATHHASH_HEX
@ -85,6 +86,9 @@ void pathHash(const std::string &path, std::string &phash, unsigned int maxlen)
// Truncate path and append hash // Truncate path and append hash
phash = path.substr(0, maxlen - HASHLEN) + hash; phash = path.substr(0, maxlen - HASHLEN) + hash;
} }
#ifndef NO_NAMESPACES
}
#endif // NO_NAMESPACES
#ifdef TEST_PATHHASH #ifdef TEST_PATHHASH
#include <stdio.h> #include <stdio.h>

12
src/rcldb/pathhash.h
View File

@ -16,12 +16,20 @@
*/ */
#ifndef _PATHHASH_H_INCLUDED_ #ifndef _PATHHASH_H_INCLUDED_
#define _PATHHASH_H_INCLUDED_ #define _PATHHASH_H_INCLUDED_
/* @(#$Id: pathhash.h,v 1.2 2006-01-30 11:15:27 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: pathhash.h,v 1.3 2006-11-15 14:57:53 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string> #include <string>
extern void pathHash(const std::string &path, std::string &hash, #ifndef NO_NAMESPACES
using std::string;
namespace Rcl {
#endif
extern void pathHash(const string &path, string &hash,
unsigned int len); unsigned int len);
#ifndef NO_NAMESPACES
}
#endif
#endif /* _PATHHASH_H_INCLUDED_ */ #endif /* _PATHHASH_H_INCLUDED_ */

3
src/rcldb/rcldb.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.94 2006-11-14 13:55:43 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.95 2006-11-15 14:57:53 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -32,7 +32,6 @@ static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.94 2006-11-14 13:55:43 dockes Exp $
#ifndef NO_NAMESPACES #ifndef NO_NAMESPACES
using namespace std; using namespace std;
#endif /* NO_NAMESPACES */ #endif /* NO_NAMESPACES */
#define RCLDB_INTERNAL
#include "rcldb.h" #include "rcldb.h"
#include "stemdb.h" #include "stemdb.h"

4
src/rcldb/searchdata.h
View File

@ -1,6 +1,6 @@
#ifndef _SEARCHDATA_H_INCLUDED_ #ifndef _SEARCHDATA_H_INCLUDED_
#define _SEARCHDATA_H_INCLUDED_ #define _SEARCHDATA_H_INCLUDED_
/* @(#$Id: searchdata.h,v 1.4 2006-11-14 13:55:43 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: searchdata.h,v 1.5 2006-11-15 14:57:53 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string> #include <string>
#include <list> #include <list>
@ -10,9 +10,9 @@
#ifndef NO_NAMESPACES #ifndef NO_NAMESPACES
using std::list; using std::list;
using std::string; using std::string;
#endif
namespace Rcl { namespace Rcl {
#endif // NO_NAMESPACES
/** Search clause types */ /** Search clause types */
enum SClType { enum SClType {

11
src/rcldb/stemdb.h
View File

@ -1,7 +1,6 @@
#ifndef _STEMDB_H_INCLUDED_ #ifndef _STEMDB_H_INCLUDED_
#define _STEMDB_H_INCLUDED_ #define _STEMDB_H_INCLUDED_
/* @(#$Id: stemdb.h,v 1.1 2006-04-13 09:50:03 dockes Exp $ (C) 2004 J.F.Dockes */ /* @(#$Id: stemdb.h,v 1.2 2006-11-15 14:57:53 dockes Exp $ (C) 2004 J.F.Dockes */
#ifdef RCLDB_INTERNAL
/// Stem database code /// Stem database code
/// ///
/// Stem databases list stems and the set of index terms they expand to. They /// Stem databases list stems and the set of index terms they expand to. They
@ -14,9 +13,12 @@
#include <string> #include <string>
#include <xapian.h> #include <xapian.h>
#ifndef NO_NAMESPACES
using std::string;
using std::list;
namespace Rcl { namespace Rcl {
namespace StemDb { namespace StemDb {
#endif // NO_NAMESPACES
/// Get languages of existing stem databases /// Get languages of existing stem databases
extern std::list<std::string> getLangs(const std::string& dbdir); extern std::list<std::string> getLangs(const std::string& dbdir);
@ -30,8 +32,9 @@ extern std::list<std::string> stemExpand(const std::string& dbdir,
const std::string& lang, const std::string& lang,
const std::string& term); const std::string& term);
#ifndef NO_NAMESPACES
} }
} }
#endif // NO_NAMESPACES
#endif // RCLDB_INTERNAL
#endif /* _STEMDB_H_INCLUDED_ */ #endif /* _STEMDB_H_INCLUDED_ */