yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

packaging ok with lib/recoll/librecoll.so... on debian fedora and suse

Browse source
This commit is contained in:
Jean-Francois Dockes 2012-12-30 17:31:00 +01:00
parent a9002d1a01
commit b9f889180d
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.in
View file

@ -16,7 +16,7 @@ all: mk/sysconf
${MAKE} -C lib ${MAKE} -C lib
${MAKE} -C index recollindex ${MAKE} -C index recollindex
@NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro) @NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro)
@NOQTMAKE@${MAKE} -C $(QTGUI) depth=.. @NOQTMAKE@${MAKE} -C $(QTGUI) depth=.. prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir)
@NOPYTHON@${MAKE} -C python/recoll libdir=$(libdir) @NOPYTHON@${MAKE} -C python/recoll libdir=$(libdir)
${MAKE} -C query recollq xadump ${MAKE} -C query recollq xadump

7
src/qtgui/recoll.pro.in
View file

@ -80,9 +80,10 @@ unix {
UI_DIR = .ui UI_DIR = .ui
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj OBJECTS_DIR = .obj
# Expanding prefix here is not good as it means that it can't be # Note: libdir may be substituted with sthing like $(exec_prefix)/lib
# redefined at make time. # at this point and will go as such in the Makefile. Expansion will be
LIBS += $(BSTATIC) -L../lib -lrecoll -Wl,-rpath=@prefix@/lib/recoll \ # completed at make time.
LIBS += $(BSTATIC) -L../lib -lrecoll -Wl,-rpath=@libdir@/recoll \
@LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \ @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
@LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz @LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz

6
src/query/Makefile
View file

@ -4,7 +4,7 @@ include $(depth)/mk/sysconf
PROGS = xadump recollq #trhist qtry qxtry PROGS = xadump recollq #trhist qtry qxtry
SRCS = xadump.cpp SRCS = xadump.cpp
all: depend $(PROGS) librecoll all: depend librecoll $(PROGS)
XADUMP_OBJS= xadump.o XADUMP_OBJS= xadump.o
xadump : $(XADUMP_OBJS) xadump : $(XADUMP_OBJS)
@ -14,14 +14,14 @@ xadump.o : xadump.cpp
$(CXX) $(ALL_CXXFLAGS) -c xadump.cpp $(CXX) $(ALL_CXXFLAGS) -c xadump.cpp
RECOLLQ_OBJS= recollq.o RECOLLQ_OBJS= recollq.o
recollq : $(RECOLLQ_OBJS) librecoll recollq : $(RECOLLQ_OBJS)
$(CXX) $(ALL_CXXFLAGS) -o recollq $(RECOLLQ_OBJS) \ $(CXX) $(ALL_CXXFLAGS) -o recollq $(RECOLLQ_OBJS) \
$(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) \ $(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) \
$(LIBSYS) $(LIBSYS)
recollq.o : recollq.cpp recollq.o : recollq.cpp
$(CXX) $(ALL_CXXFLAGS) -DTEST_RECOLLQ -c recollq.cpp $(CXX) $(ALL_CXXFLAGS) -DTEST_RECOLLQ -c recollq.cpp
HISTORY_OBJS= trhist.o $(BIGLIB) HISTORY_OBJS= trhist.o
trhist : $(HISTORY_OBJS) trhist : $(HISTORY_OBJS)
$(CXX) $(ALL_CXXFLAGS) -o trhist $(HISTORY_OBJS) \ $(CXX) $(ALL_CXXFLAGS) -o trhist $(HISTORY_OBJS) \
$(LIBICONV) $(LIBXAPIAN) $(LIBICONV) $(LIBXAPIAN)