rearrange make includes+prepare bin static distrib

src/Makefile

@@ -1,10 +1,18 @@
-all:
+
-	test -f mk/sysconf || ./configure
+all: mk/sysconf
 	cd lib; $(MAKE)
 	cd bincimapmime; $(MAKE)
 	cd index; $(MAKE)
 	cd qtgui; qmake recoll.pro; rm -f recoll; $(MAKE)
 
+mk/sysconf:
+	./configure
+
+static:
+	rm -f index/recollindex qtgui/recoll
+	cd index; $(MAKE) BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
+	cd qtgui; $(MAKE) BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
+
 clean:
 	cd common; $(MAKE) clean
 	cd index; $(MAKE) clean

src/excludefile

@@ -1,24 +1,23 @@
-*/.#*
+*.o
-*/CVS
+*~
-*/alldeps
+#*
-*/.moc
+.moc
-*/.ui
+.obj
-*/.obj
+.ui
-*/*/.moc
-*/*/.ui
-*/*/.obj
 .#*
-./autom4*
 CVS
+alldeps
+.#*
+autom4*
 TAGS
-aux/CVS
 config.cache
 config.log
 config.status
 excludefile
 makedist.sh
-mk/sysconf
+sysconf
 qtgui/Makefile
 qtgui/preview/Makefile
 qtgui/preview/preview.pro
 qtgui/preview/pvmain.cpp
+lib/librcl.a

src/index/Makefile

@@ -9,7 +9,7 @@ all: $(PROGS)
 RECOLLINDEX_OBJS= recollindex.o $(BIGLIB) $(MIMELIB)
 recollindex : $(RECOLLINDEX_OBJS)
 	$(CXX) $(CXXFLAGS) -o recollindex $(RECOLLINDEX_OBJS) \
-		$(LIBXAPIAN) $(LIBICONV) $(LIBSYS)
+	       $(BSTATIC) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) $(LIBSYS)
 recollindex.o : idxdriver.cpp
 	$(CXX) $(CXXFLAGS) -c -o recollindex.o idxdriver.cpp
 

src/makesrcdist.sh

@@ -41,6 +41,7 @@ A more complete version of this document can be found at http://www.recoll.org
 EOF
 
 links -dump ~/projets/pagepers/recoll/index.html >> README
+links -dump ~/projets/pagepers/recoll/credits.html >> README
 links -dump ~/projets/pagepers/recoll/usermanual.html >> README
 links -dump ~/projets/pagepers/recoll/installation.html >> INSTALL
 cvs commit -m '' README INSTALL

src/mk/FreeBSD

@@ -1,9 +1,8 @@
-CXXFLAGS = -pthread -Wall -Wno-unused-variable -g \
+include ../mk/commondefs
-	 -I. -I../index -I../utils -I../common \
+
-	 -I../unac -I../bincimapmime -I/usr/local/include  \
+CXXFLAGS = $(COMMONCXXFLAGS) -pthread  \
-	 \
 	 -DHAVE_VASPRINTF=1 \
 	 -DHAVE_MKDTEMP=1
 
-LIBXAPIAN = -L/usr/local/lib -lxapian
 LIBICONV =  -L/usr/local/lib -liconv
+LIBSYS = 

src/mk/Linux

@@ -1,10 +1,9 @@
-CXXFLAGS = -Wall -g -I. -I../index -I../utils -I../common \
+include ../mk/commondefs
-	 -I../unac -I../bincimapmime -I/usr/local/include \
+
-	 -D_GNU_SOURCE \
+CXXFLAGS = $(COMMONCXXFLAGS) -D_GNU_SOURCE \
 	 -DHAVE_VASPRINTF=1 \
 	 -DHAVE_MKDTEMP=1
 
-LIBXAPIAN = -L/usr/local/lib -lxapian
 LIBICONV =  
 
 LIBSYS = -lpthread

src/mk/SunOS

@@ -1,9 +1,10 @@
-CXXFLAGS = -Wall -g -I. -I../index -I../utils -I../common \
+include ../mk/commondefs
-	 -I../unac -I../bincimapmime -I/usr/local/include 
+
+CXXFLAGS = $(COMMONCXXFLAGS)
+
 CC=gcc
 CXX=g++
 
-LIBXAPIAN = -L/usr/local/lib -lxapian
 LIBICONV =  -L/usr/local/lib -liconv
 
 LIBSYS = -lpthread -lnsl -lsocket

src/qtgui/recoll.pro

@@ -27,7 +27,7 @@ unix {
   MOC_DIR = .moc
   OBJECTS_DIR = .obj
   LIBS += ../lib/librcl.a ../bincimapmime/libmime.a \
-          -L/usr/local/lib -lxapian -liconv \
+            $(BSTATIC) -L/usr/local/lib -lxapian -liconv $(BDYNAMIC) \
            -lz
   INCLUDEPATH += ../common ../index ../query ../unac ../utils