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

Build: ensure that we do not try to build the dynamic lib after compiling non-pic objects. Remove configure from source control

Browse source
This commit is contained in:
Jean-Francois Dockes 2013-10-30 08:38:14 +01:00
parent 70d26c551f
commit 6b49c23aa8
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.hgignore
View file

@ -13,6 +13,7 @@ src/common/autoconfig.h
src/common/rclversion.h src/common/rclversion.h
src/config.log src/config.log
src/config.status src/config.status
src/configure
src/desktop/unity-lens-recoll/Makefile src/desktop/unity-lens-recoll/Makefile
src/desktop/unity-lens-recoll/autom4te.cache src/desktop/unity-lens-recoll/autom4te.cache
src/desktop/unity-lens-recoll/bin/unity-recoll-daemon src/desktop/unity-lens-recoll/bin/unity-recoll-daemon
@ -83,6 +84,7 @@ src/kde/kioslave/kio_recoll/builddir
src/lib/alldeps src/lib/alldeps
src/lib/librecoll.a src/lib/librecoll.a
src/lib/librecoll.so* src/lib/librecoll.so*
src/lib/mkMake
src/mk/localdefs src/mk/localdefs
src/mk/sysconf src/mk/sysconf
src/python/recoll/build src/python/recoll/build

5
src/Makefile.in
View file

@ -12,7 +12,10 @@ mandir = @mandir@
QMAKE = @QMAKE@ QMAKE = @QMAKE@
QTGUI = @QTGUI@ QTGUI = @QTGUI@
RCLLIBVERSION=@RCLLIBVERSION@
all: mk/sysconf all: mk/sysconf
(cd lib; sh mkMake)
${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)
@ -62,7 +65,7 @@ distclean: clean
qtgui/recoll.pro \ qtgui/recoll.pro \
config.log config.status \ config.log config.status \
recollinstall \ recollinstall \
lib/*.dep common/autoconfig.h lib/*.dep lib/mkMake lib/Makefile common/autoconfig.h
rm -f common/rclversion.h rm -f common/rclversion.h
rm -f index/alldeps lib/alldeps query/alldeps \ rm -f index/alldeps lib/alldeps query/alldeps \
bincimapmime/alldeps common/alldeps internfile/alldeps utils/alldeps bincimapmime/alldeps common/alldeps internfile/alldeps utils/alldeps

2
src/configure.ac
View file

@ -604,8 +604,6 @@ do
cp -f /dev/null $d/alldeps cp -f /dev/null $d/alldeps
done done
(cd lib;RCLLIBVERSION=$RCLLIBVERSION sh mkMake)
AC_OUTPUT AC_OUTPUT
if cmp -s mk/localdefs mk/localdefs.new ; then if cmp -s mk/localdefs mk/localdefs.new ; then

3
src/lib/mkMake.in
View file

@ -118,13 +118,14 @@ defs=\$\(depth\)/mk/localdefs
test -f $mk && chmod +w $mk test -f $mk && chmod +w $mk
NODYNLIB=@NODYNLIB@ NODYNLIB=@NODYNLIB@
RCLLIBVERSION=@RCLLIBVERSION@
cat > $mk <<EOF cat > $mk <<EOF
# DONT EDIT BY HAND: created by script mkMake # DONT EDIT BY HAND: created by script mkMake
depth = ${depth} depth = ${depth}
include \$(depth)/mk/sysconf include \$(depth)/mk/sysconf
LIBRECOLL=librecoll.so.\$(RCLLIBVERSION) LIBRECOLL=librecoll.so.${RCLLIBVERSION}
LIBS = librecoll.a LIBS = librecoll.a
${NODYNLIB}LIBS = librecoll.a \$(LIBRECOLL) ${NODYNLIB}LIBS = librecoll.a \$(LIBRECOLL)