From b55e443c916299aca3a229f1abfee6c25351e388 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Thu, 20 Oct 2005 08:34:51 +0000
Subject: [PATCH] small warning and compilation adjustments

---
 src/Makefile                   | 26 ++++++++++++++------------
 src/VERSION                    |  2 +-
 src/bincimapmime/Makefile      |  5 ++---
 src/excludefile                | 15 +++++++++++----
 src/lib/Makefile               |  6 ++++--
 src/mk/FreeBSD                 |  3 ++-
 src/qtgui/plaintorich.cpp      |  4 ++--
 src/qtgui/preview/preview.ui.h |  1 -
 src/qtgui/recoll.pro           |  9 +++++----
 9 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index c6008df8..84eac932 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,16 @@
 all:
-	cd lib;make
-	cd bincimapmime;make
-	cd index;make
-	cd qtgui;qmake recoll.pro ; rm -f recoll;make
-clean:
-	cd common;make clean
-	cd index;make clean
-	cd lib;make clean
-	cd bincimapmime;make clean
-	cd qtgui;rm -f recoll;make clean
-	cd query;make clean
-	cd utils;make clean
+	test -f mk/sysconf || ./configure
+	cd lib; $(MAKE)
+	cd bincimapmime; $(MAKE)
+	cd index; $(MAKE)
+	cd qtgui; qmake recoll.pro; rm -f recoll; $(MAKE)
+
+clean:
+	cd common; $(MAKE) clean
+	cd index; $(MAKE) clean
+	cd lib; $(MAKE) clean
+	cd bincimapmime; $(MAKE) clean
+	cd qtgui; rm -f recoll; $(MAKE) clean
+	cd query; $(MAKE) clean
+	cd utils; $(MAKE) clean
 
diff --git a/src/VERSION b/src/VERSION
index d3827e75..f2457ad8 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.0
+1.01
diff --git a/src/bincimapmime/Makefile b/src/bincimapmime/Makefile
index 8bbc56c5..93838fa7 100644
--- a/src/bincimapmime/Makefile
+++ b/src/bincimapmime/Makefile
@@ -27,8 +27,7 @@ trbinc: trbinc.o
 clean: 
 	rm -f *.o $(LIBS)
 
-alldeps:depend
-depend:
+depend: alldeps
+alldeps: $(SRCS)
 	$(CXX) $(CXXFLAGS) -M $(SRCS) > alldeps
 include alldeps
-
diff --git a/src/excludefile b/src/excludefile
index b49e6b60..8452824c 100644
--- a/src/excludefile
+++ b/src/excludefile
@@ -1,14 +1,21 @@
-CVS
+*/.#*
 */CVS
-Changelog
+*/alldeps
+*/.moc
+*/.ui
+*/.obj
+*/*/.moc
+*/*/.ui
+*/*/.obj
+.#*
 ./autom4*
+CVS
+TAGS
 aux/CVS
 config.cache
 config.log
 config.status
 excludefile
 makedist.sh
-.#*
-*/*.#*
 mk/sysconf
 qtgui/Makefile
diff --git a/src/lib/Makefile b/src/lib/Makefile
index a7d53bfb..a09eb710 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -87,8 +87,10 @@ unacpp.o : ../common/unacpp.cpp
 clean: 
 	rm -f *.o $(LIBS)
 
-alldeps:depend
-depend:
+depend: alldeps
+
+alldeps: $(SRCS)
 	$(CXX) $(CXXFLAGS) -M $(SRCS) > alldeps
+
 include alldeps
 
diff --git a/src/mk/FreeBSD b/src/mk/FreeBSD
index 3ed54e12..a659c50a 100644
--- a/src/mk/FreeBSD
+++ b/src/mk/FreeBSD
@@ -1,4 +1,5 @@
-CXXFLAGS = -pthread -Wall -g -I. -I../index -I../utils -I../common \
+CXXFLAGS = -pthread -Wall -Wno-unused-variable -g \
+	 -I. -I../index -I../utils -I../common \
 	 -I../unac -I../bincimapmime -I/usr/local/include  \
 	 \
 	 -DHAVE_VASPRINTF=1
diff --git a/src/qtgui/plaintorich.cpp b/src/qtgui/plaintorich.cpp
index 1b5ec4d1..69de7ca2 100644
--- a/src/qtgui/plaintorich.cpp
+++ b/src/qtgui/plaintorich.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: plaintorich.cpp,v 1.3 2005-10-19 10:21:48 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: plaintorich.cpp,v 1.4 2005-10-20 08:34:51 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 
@@ -30,7 +30,7 @@ class myTextSplitCB : public TextSplitCB {
     }
 
     // Callback called by the text-to-words breaker for each word
-    virtual bool takeword(const std::string& term, int pos, int bts, int bte) {
+    virtual bool takeword(const std::string& term, int, int bts, int bte) {
 	string dumb;
 	Rcl::dumb_string(term, dumb);
 	//LOGDEB(("Input dumbbed term: '%s' %d %d %d\n", dumb.c_str(), 
diff --git a/src/qtgui/preview/preview.ui.h b/src/qtgui/preview/preview.ui.h
index e721d0e1..91f34f09 100644
--- a/src/qtgui/preview/preview.ui.h
+++ b/src/qtgui/preview/preview.ui.h
@@ -106,7 +106,6 @@ void Preview::doSearch(bool next, bool reverse)
 	    }
 	} else {
 	    // Forward search: start from end of selection
-	    int bogus;
 	    mspara = mepara;
 	    msindex = meindex;
 	    //LOGDEB(("New para: %d index %d\n", mspara, msindex));
diff --git a/src/qtgui/recoll.pro b/src/qtgui/recoll.pro
index 6c4ef05a..b2c95d9a 100644
--- a/src/qtgui/recoll.pro
+++ b/src/qtgui/recoll.pro
@@ -26,14 +26,15 @@ unix {
   UI_DIR = .ui
   MOC_DIR = .moc
   OBJECTS_DIR = .obj
-  LIBS += ../lib/librcl.a ../bincimapmime/libmime.a -L/usr/local/lib -lxapian -liconv \
-       -lfontconfig -lfreetype -lexpat -lz
+  LIBS += ../lib/librcl.a ../bincimapmime/libmime.a \
+          -L/usr/local/lib -lxapian -liconv \
+           -lz
   INCLUDEPATH += ../common ../index ../query ../unac ../utils 
 
-    }
+}
 
 UNAME = $$system(uname -s)
 contains( UNAME, [lL]inux ) {
           LIBS -= -liconv
-	  }
+}