--- Makefile.in	2003-11-27 15:46:46.887752568 +0000
+++ Makefile.in	2003-11-27 16:14:17.325847840 +0000
@@ -7,7 +7,7 @@
 
 INCLUDE=@DRIVER_INCDIR@  ${OTHERINCDIR} -I.
 
-CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
+CFLAGS=-O0 -Wall -g ${OTHER_CFLAGS}
 
 LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
 ALLOBJS=${LIBOBJS} tester.o
@@ -17,6 +17,9 @@
 LIBCAL=libmcal.a
 LIBCAL_SO=libmcal.so
 
+%.o: %.c
+	$(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
+
 all: libmcal.a libmcal.so
 
 install: libmcal.a libmcal.so
@@ -38,7 +41,7 @@
 
 libmcal.so: $(LIBOBJS)
 	rm -f $(LIBCAL_SO)
-	gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
+	$(CC) -Wl,-soname=$@ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -o $(LIBCAL_SO) $(LIBOBJS)
 
 lex.ical_yy.c: icalscanner.lex
 	$(FLEX) $<
--- mstore/Makefile.old	2004-08-08 16:37:13.641537544 +0100
+++ mstore/Makefile	2004-08-08 16:37:35.473218624 +0100
@@ -8,6 +8,10 @@
 ALLOBJS=mstore.o
 TARGET=mstore_driver.o
 
+%.o: %.c
+	$(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
+
+
 all: $(TARGET)
 
 
--- icap/Makefile.old	2004-08-08 16:38:58.353618888 +0100
+++ icap/Makefile	2004-08-08 16:39:18.841504256 +0100
@@ -7,6 +7,10 @@
 ALLOBJS=icap.o icaproutines.o lex.icap_yy.o
 TARGET=icap_driver.o
 
+%.o: %.c
+	$(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
+
+
 all: $(TARGET)