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

ensure Makefile uses same qmake as configure

Browse Source
This commit is contained in:
dockes 2006-02-21 12:56:55 +00:00
parent 968d96266c
commit b222354512
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile.in
View File

@ -1,4 +1,4 @@
# @(#$Id: Makefile.in,v 1.3 2006-02-02 08:35:17 dockes Exp $ (C) 2005 J.F.Dockes # @(#$Id: Makefile.in,v 1.4 2006-02-21 12:56:55 dockes Exp $ (C) 2005 J.F.Dockes
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -7,12 +7,13 @@ bindir = @bindir@
datadir = @datadir@ datadir = @datadir@
mandir = @mandir@ mandir = @mandir@
QMAKE = @QMAKE@
all: mk/sysconf common/rclversion.h all: mk/sysconf common/rclversion.h
cd lib; ${MAKE} cd lib; ${MAKE}
cd bincimapmime; ${MAKE} cd bincimapmime; ${MAKE}
cd index; ${MAKE} recollindex cd index; ${MAKE} recollindex
cd qtgui; PATH=${PATH}:${QTDIR}/bin; export PATH; qmake recoll.pro; \ cd qtgui; ${QMAKE} recoll.pro; ${MAKE} depth=..
${MAKE} depth=..
mk/sysconf: mk/sysconf:
@echo "You need to run configure first" ; exit 1 @echo "You need to run configure first" ; exit 1
@ -26,7 +27,7 @@ static:
cd bincimapmime; ${MAKE} cd bincimapmime; ${MAKE}
cd index; rm -f recollindex; \ cd index; rm -f recollindex; \
${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic recollindex ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic recollindex
cd qtgui; PATH=${PATH}:${QTDIR}/bin; export PATH; qmake recoll.pro; \ cd qtgui; $(QMAKE) recoll.pro; \
rm -f recoll; \ rm -f recoll; \
${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic depth=.. ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic depth=..

1
src/configure vendored
View File

@ -2313,6 +2313,7 @@ QTRECOLL_DATADIR=${m_datadir}/recoll
ac_config_files="$ac_config_files mk/localdefs" ac_config_files="$ac_config_files mk/localdefs"
ac_config_files="$ac_config_files recollinstall" ac_config_files="$ac_config_files recollinstall"

1
src/configure.ac
View File

@ -135,6 +135,7 @@ AC_SUBST(XAPIANCXXFLAGS)
AC_SUBST(LIBICONV) AC_SUBST(LIBICONV)
AC_SUBST(INCICONV) AC_SUBST(INCICONV)
AC_SUBST(QTRECOLL_DATADIR) AC_SUBST(QTRECOLL_DATADIR)
AC_SUBST(QMAKE)
AC_CONFIG_FILES(mk/localdefs) AC_CONFIG_FILES(mk/localdefs)
AC_CONFIG_FILES(recollinstall) AC_CONFIG_FILES(recollinstall)