Switch to side-by-side view

--- a/src/Makefile
+++ b/src/Makefile
@@ -1,21 +1,28 @@
+# @(#$Id: Makefile,v 1.11 2005-11-12 11:26:09 dockes Exp $  (C) 2005 J.F.Dockes
+
+# Default values. These can be overridden on the command line ie: 
+# make PREFIX=/usr
 PREFIX=/usr/local
 INSTALL = install -c
 
 all: mk/sysconf
 	cd lib; ${MAKE}
 	cd bincimapmime; ${MAKE}
-	cd index; ${MAKE}
-	cd qtgui; qmake recoll.pro; rm -f recoll; ${MAKE}
+	cd index; rm -f recollindex; ${MAKE} recollindex
+	cd qtgui; qmake recoll.pro; rm -f recoll; \
+	   cat ../mk/commondefs ../mk/sysconf Makefile | ${MAKE} -f -
 
 mk/sysconf:
 	./configure
 
 static:
-	rm -f index/recollindex qtgui/recoll
 	cd lib; ${MAKE}
 	cd bincimapmime; ${MAKE}
-	cd index; ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
-	cd qtgui; qmake recoll.pro; ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
+	cd index; rm -f recollindex; \
+	   ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
+	cd qtgui; qmake recoll.pro; rm -f recoll \
+	   cat ../mk/commondefs ../mk/sysconf Makefile | ${MAKE} -f - \
+	       BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
 
 clean:
 	cd common; ${MAKE} clean
@@ -27,6 +34,9 @@
 	@-cd qtgui; ${MAKE} clean
 	rm -f qtgui/Makefile qtgui/preview/Makefile qtgui/recoll
 
+distclean: clean
+	rm -f mk/sysconf 
+
 install: all
 	./recollinstall ${PREFIX}