--- endeavour2/lib/Makefile.old	2006-11-06 09:00:00.000000000 +0100
+++ endeavour2/lib/Makefile	2007-06-04 17:34:50.040582389 +0200
@@ -4,7 +4,7 @@
 # Compiler flags
 #
 CFLAGS   = -Wall -O2 -g -fPIC \
-           `glib-config --cflags`
+           `glib-config --cflags` `gtk-config --cflags`
 CPPFLAGS = -D__cplusplus -Dc_plusplus
 
 
@@ -42,14 +42,14 @@
 LIB_CFG_BIN = endeavour2-config
 LIB_CFG_MAN = endeavour2-config.1.bz2
 LIB         = libendeavour2.so
-OBJ_C   = $(SRC_C:.c=.o)
-OBJ_CPP = $(SRC_CPP:.cpp=.o)
+OBJ_C   = $(SRC_C:.c=.o) $(SRC_C_P:.c=.o)
+OBJ_CPP = $(SRC_CPP:.cpp=.o) $(SRC_CPP_P:.cpp=.o)
 .c.o:
 	@echo "Compiling module $*.o"
-	@+$(CC) -c $*.c $(CFLAGS)
+	@+$(CC) -c $*.c $(CFLAGS) -o $*.o
 .cpp.o:
 	@echo "Compiling module $*.o"
-	@+$(CPP) -c $*.cpp $(CFLAGS) $(CPPFLAGS)
+	@+$(CPP) -c $*.cpp $(CFLAGS) $(CPPFLAGS) -o $*.o
 
 
 # Programs and their flags
@@ -104,6 +104,8 @@
 	@-$(LS) $(LSFLAGS) $(LIB)
 
 prebuild:
+	@echo "Removing $(SRC_C_P:.c=.o) $(SRC_CPP_P:.C=.o) (force recompile with -fPIC)"
+	@${RM} ${RMFLAGS} $(SRC_C_P:.c=.o) $(SRC_CPP_P:.cpp=.o)
 	@echo "Building library \"$(LIB)\"..."
 
 postbuild:
--- endeavour2/lib/Makefile.srclist.old	2006-11-06 09:00:00.000000000 +0100
+++ endeavour2/lib/Makefile.srclist	2007-06-04 17:30:13.000000000 +0200
@@ -22,11 +22,11 @@
         edv_recycle.c edv_window.c
 
 # Add source C files from Endeavour 2
-SRC_C += ../cfg.c ../cfg_fio.c ../edv_interps.c			\
+SRC_C_P = ../cfg.c ../cfg_fio.c ../edv_interps.c			\
          ../edv_recbin_index.c ../edv_recbin_stat.c		\
          ../edv_recycled_obj.c ../edv_utils.c
 
 
 # Source C++ files
-SRC_CPP = ../disk.cpp ../fio.cpp ../prochandle.cpp		\
+SRC_CPP_P = ../disk.cpp ../fio.cpp ../prochandle.cpp		\
           ../string.cpp