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

Makefile: use -C option instead of cd to fix bsd make -j error

Browse Source
This commit is contained in:
Jean-Francois Dockes 2011-01-04 08:59:34 +01:00
parent 829b4b3b4e
commit ca2297e363
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Makefile.in
View File

@ -12,10 +12,11 @@ QMAKE = @QMAKE@
QTGUI = @QTGUI@ QTGUI = @QTGUI@
all: mk/sysconf common/rclversion.h all: mk/sysconf common/rclversion.h
cd lib; ${MAKE} ${MAKE} -C lib
cd index; ${MAKE} recollindex ${MAKE} -C index recollindex
@NOQTMAKE@cd $(QTGUI); ${QMAKE} recoll.pro; ${MAKE} depth=.. @NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro)
@NOCMDLINE@ cd query; ${MAKE} recollq @NOQTMAKE@${MAKE} -C $(QTGUI) depth=..
@NOCMDLINE@ ${MAKE} -C query recollq
mk/sysconf: mk/sysconf:
@echo "You need to run configure first" ; exit 1 @echo "You need to run configure first" ; exit 1
@ -25,31 +26,32 @@ ${versfile} : VERSION
echo 'static const char *rclversionstr = "'`cat VERSION`'";'>> ${versfile} echo 'static const char *rclversionstr = "'`cat VERSION`'";'>> ${versfile}
static: mk/sysconf common/rclversion.h static: mk/sysconf common/rclversion.h
cd lib; ${MAKE} ${MAKE} -C lib
cd index; rm -f recollindex; \ rm -f index/recollindex
${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic \ ${MAKE} -C index BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic \
LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@" \ LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@" \
recollindex recollindex
@NOQTMAKE@cd $(QTGUI); $(QMAKE) recoll.pro; \ @NOQTMAKE@(cd $(QTGUI); $(QMAKE) recoll.pro)
@NOQTMAKE@ rm -f recoll; \ @NOQTMAKE@rm -f $(QTGUI)/recoll
@NOQTMAKE@ ${MAKE} BSTATIC=-Wl,-Bstatic \ @NOQTMAKE@${MAKE} -C $(QTGUI) BSTATIC=-Wl,-Bstatic \
@NOQTMAKE@ BDYNAMIC=-Wl,-Bdynamic depth=.. \ @NOQTMAKE@ BDYNAMIC=-Wl,-Bdynamic depth=.. \
@NOQTMAKE@ LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@" @NOQTMAKE@ LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@"
clean: clean:
-cd common; ${MAKE} clean ${MAKE} -C common clean
-cd index; ${MAKE} clean ${MAKE} -C index clean
-cd internfile; ${MAKE} clean ${MAKE} -C internfile clean
-cd lib; ${MAKE} clean ${MAKE} -C lib clean
-cd query; ${MAKE} clean ${MAKE} -C query clean
-cd utils; ${MAKE} clean ${MAKE} -C utils clean
#cd doc/user; ${MAKE} clean @NOQTMAKE@@-${MAKE} -C $(QTGUI) clean
@NOQTMAKE@@-cd qtgui; ${MAKE} clean
@NOCMDLINE@ cd query; ${MAKE} clean
rm -f qtgui/Makefile qtgui/confgui/Makefile qtgui/recoll rm -f qtgui/Makefile qtgui/confgui/Makefile qtgui/recoll
rm -f common/rclversion.h rm -f common/rclversion.h
rm -f filters/rclexecm.pyc
rm -rf qtgui/.moc qtgui/.ui qtgui/confgui/.moc qtgui/confgui/.ui rm -rf qtgui/.moc qtgui/.ui qtgui/confgui/.moc qtgui/confgui/.ui
rm -rf qtgui/.obj qtgui/.moc qtgui/.ui rm -rf qtgui/.obj qtgui/.moc qtgui/.ui
rm -rf python/recoll/build
rm -rf $(QTGUI)/recoll.app
# Note: we don't remove the top Makefile, to keep the "clean" targets # Note: we don't remove the top Makefile, to keep the "clean" targets
# available but a "Make" won't work without a configure anyway # available but a "Make" won't work without a configure anyway
@ -61,7 +63,6 @@ distclean: clean
lib/*.dep common/autoconfig.h lib/*.dep common/autoconfig.h
rm -f index/alldeps lib/alldeps query/alldeps bincimapmime/alldeps rm -f index/alldeps lib/alldeps query/alldeps bincimapmime/alldeps
rm -rf autom4te.cache rm -rf autom4te.cache
rm -f filters/rclexecm.pyc
maintainer-clean: distclean maintainer-clean: distclean
rm -f doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest rm -f doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest