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

make sure that CPPFLAGS CXXFLAGS and LDFLAGS are used during the build

Browse Source
This commit is contained in:
Jean-Francois Dockes 2015-03-01 12:43:09 +01:00
parent 11f5572271
commit ce4405a666
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.in
View File

@ -20,7 +20,7 @@ all: configure mk/sysconf
${MAKE} -C lib ${MAKE} -C lib
${MAKE} -C index depend recollindex ${MAKE} -C index depend recollindex
@NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro) @NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro)
@NOQTMAKE@${MAKE} -C $(QTGUI) depth=.. prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) @NOQTMAKE@${MAKE} -C $(QTGUI) LFLAGS="$(LDFLAGS)" 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

2
src/index/Makefile
View File

@ -8,7 +8,7 @@ all: depend librecoll $(PROGS)
RECOLLINDEX_OBJS= recollindex.o rclmonrcv.o rclmonprc.o RECOLLINDEX_OBJS= recollindex.o rclmonrcv.o rclmonprc.o
recollindex : $(RECOLLINDEX_OBJS) recollindex : $(RECOLLINDEX_OBJS)
$(CXX) $(ALL_CXXFLAGS) $(RECOLL_LDFLAGS) -o recollindex \ $(CXX) $(ALL_CXXFLAGS) $(RECOLL_LDFLAGS) $(LDFLAGS) -o recollindex \
$(RECOLLINDEX_OBJS) \ $(RECOLLINDEX_OBJS) \
$(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBXAPIANSTATICEXTRA) \ $(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBXAPIANSTATICEXTRA) \
$(LIBICONV) $(BDYNAMIC) \ $(LIBICONV) $(BDYNAMIC) \

2
src/lib/mkMake.in
View File

@ -145,7 +145,7 @@ librecoll.a : \$(DEPS) \$(OBJS)
# programs or modules from the same Recoll release can be compatible. # programs or modules from the same Recoll release can be compatible.
\$(LIBRECOLL): \$(DEPS) \$(OBJS) \$(LIBRECOLL): \$(DEPS) \$(OBJS)
\$(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \ \$(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \
-Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \ \$(LDFLAGS) -Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \
\$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS) \$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS)
rm -f librecoll.so rm -f librecoll.so
ln -s \$(LIBRECOLL) librecoll.so ln -s \$(LIBRECOLL) librecoll.so