Commit 3e8989e0 authored by Jean-Francois Dockes's avatar Jean-Francois Dockes
Browse files

Build: ensure that we do not try to build the dynamic lib after compiling...

Build: ensure that we do not try to build the dynamic lib after compiling non-pic objects. Remove configure from source control
parent a41671d4
......@@ -13,6 +13,7 @@ src/common/autoconfig.h
src/common/rclversion.h
src/config.log
src/config.status
src/configure
src/desktop/unity-lens-recoll/Makefile
src/desktop/unity-lens-recoll/autom4te.cache
src/desktop/unity-lens-recoll/bin/unity-recoll-daemon
......@@ -83,6 +84,7 @@ src/kde/kioslave/kio_recoll/builddir
src/lib/alldeps
src/lib/librecoll.a
src/lib/librecoll.so*
src/lib/mkMake
src/mk/localdefs
src/mk/sysconf
src/python/recoll/build
......
......@@ -12,7 +12,10 @@ mandir = @mandir@
QMAKE = @QMAKE@
QTGUI = @QTGUI@
RCLLIBVERSION=@RCLLIBVERSION@
all: mk/sysconf
(cd lib; sh mkMake)
${MAKE} -C lib
${MAKE} -C index depend recollindex
@NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro)
......@@ -62,7 +65,7 @@ distclean: clean
qtgui/recoll.pro \
config.log config.status \
recollinstall \
lib/*.dep common/autoconfig.h
lib/*.dep lib/mkMake lib/Makefile common/autoconfig.h
rm -f common/rclversion.h
rm -f index/alldeps lib/alldeps query/alldeps \
bincimapmime/alldeps common/alldeps internfile/alldeps utils/alldeps
......
......@@ -604,8 +604,6 @@ do
cp -f /dev/null $d/alldeps
done
(cd lib;RCLLIBVERSION=$RCLLIBVERSION sh mkMake)
AC_OUTPUT
if cmp -s mk/localdefs mk/localdefs.new ; then
......
......@@ -118,13 +118,14 @@ defs=\$\(depth\)/mk/localdefs
test -f $mk && chmod +w $mk
NODYNLIB=@NODYNLIB@
RCLLIBVERSION=@RCLLIBVERSION@
cat > $mk <<EOF
# DONT EDIT BY HAND: created by script mkMake
depth = ${depth}
include \$(depth)/mk/sysconf
LIBRECOLL=librecoll.so.\$(RCLLIBVERSION)
LIBRECOLL=librecoll.so.${RCLLIBVERSION}
LIBS = librecoll.a
${NODYNLIB}LIBS = librecoll.a \$(LIBRECOLL)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment