misc small mods to help with building kio_recoll

src/mk/Darwin

@@ -1,7 +1,7 @@
-include ../mk/commondefs
-include ../mk/localdefs
+include $(depth)/mk/commondefs
+include $(depth)/mk/localdefs
 
-CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
+ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
 	   -DHAVE_VASPRINTF=1 \
 	   -DHAVE_MKDTEMP=1
 

src/mk/FreeBSD

@@ -1,7 +1,7 @@
-include ../mk/commondefs
-include ../mk/localdefs
+include $(depth)/mk/commondefs
+include $(depth)/mk/localdefs
 
-CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
+ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
 	 -pthread  \
 	 -DHAVE_VASPRINTF=1 \
 	 -DHAVE_MKDTEMP=1

src/mk/Linux

@@ -1,7 +1,8 @@
-include ../mk/commondefs
-include ../mk/localdefs
 
-CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
+include $(depth)/mk/commondefs
+include $(depth)/mk/localdefs
+
+ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
 	 -D_GNU_SOURCE \
          -DPUTENV_ARG_NOT_CONST \
 	 -DHAVE_VASPRINTF=1 \

src/mk/SunOS

@@ -1,10 +1,10 @@
-include ../mk/commondefs
-include ../mk/localdefs
+include $(depth)/mk/commondefs
+include $(depth)/mk/localdefs
 
-CXXFLAGS = $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
+ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
          -DPUTENV_ARG_NOT_CONST 
 
-CC=gcc
-CXX=g++
+CC = gcc
+CXX = g++
 
 LIBSYS = -lpthread -lnsl -lsocket

src/mk/commondefs

@@ -1,15 +1,18 @@
 # Definitions mostly common to all systems, can be overridden by
 # sys-specific include
 
+COMMONCXXFLAGS = -Wall -Wno-unused -I. -I$(depth)/index \
+	       -I$(depth)/utils -I$(depth)/common \
+	       -I$(depth)/unac -I$(depth)/bincimapmime \
+	       -I/usr/local/include
 
-COMMONCXXFLAGS = -Wall -Wno-unused -g -I. -I../index -I../utils -I../common \
-	 -I../unac -I../bincimapmime -I/usr/local/include
+# We happen to be using gcc on all platforms for now. Can be overridden in
+# sys file anyway
+PIC_CXXFLAGS = -fPIC -DPIC
+
+BIGLIB = $(depth)/lib/librcl.a
+MIMELIB = $(depth)/bincimapmime/libmime.a
 
-BIGLIB = ../lib/librcl.a
-MIMELIB = ../bincimapmime/libmime.a
 RANLIB = test -f
+
 AR=ar
-
-INSTALL = install -c
-
-#QTDIR = /usr

src/mk/localdefs.in

@@ -9,3 +9,4 @@ RECOLL_PREFIX=@prefix@
 LOCALCXXFLAGS = $(INCICONV) $(XAPIANCXXFLAGS) \
 	      -DRECOLL_PREFIX=\"$(RECOLL_PREFIX)\"
 
+CXXFLAGS = -g