--- Makefile.in.orig	Tue Jan 28 18:45:21 2003
+++ Makefile.in	Tue Jan 28 23:17:26 2003
@@ -1,56 +1,63 @@
 # 	$Id: Makefile.in,v 1.5 2001/07/03 16:03:19 rufustfirefly Exp $
 
-CC=gcc
-FLEX=flex
+FLEX=/usr/bin/flex
 
 @BOOTSTRAP@
 
 INCLUDE=@DRIVER_INCDIR@  ${OTHERINCDIR} -I.
 
-CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
+CFLAGS+=-Wall ${INCLUDE} ${OTHER_CFLAGS} -D_REENTRANT -fPIC
 
 LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
 ALLOBJS=${LIBOBJS} tester.o
 OTHERLIBS=${OTHERLIBS}
 OTHERLIBDIR=${OTHERLIBDIR}
 
+SHLIBLDFLAGS=-shared
+REV=0.6
+
 LIBCAL=libmcal.a
 LIBCAL_SO=libmcal.so
 
-all: libmcal.a libmcal.so
+all: $(LIBCAL) $(LIBCAL_SO).$(REV)
 
-install: libmcal.a libmcal.so
+install: all
 	mkdir -p ${DESTDIR}@prefix@/lib/
 	mkdir -p ${DESTDIR}@prefix@/include/mcal/
-	install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@prefix@/lib
+	rm -f ${DESTDIR}@prefix@/lib/$(LIBCAL_SO)
+	install -m 755 -o 0 -g 0 $(LIBCAL) $(LIBCAL_SO).0 ${DESTDIR}@prefix@/lib
+	ln -s ${DESTDIR}@prefix@/lib/$(LIBCAL_SO).0 ${DESTDIR}@prefix@/lib/$(LIBCAL_SO)
 	install -m 644 -o 0 -g 0 \
 	  mcal.h bool.h datetime.h drivers.h cal_misc.h icalroutines.h \
 	  ${DESTDIR}@prefix@/include/mcal/
 	touch installed
 
 install-strip: installed
-	strip ${DESTDIR}@prefix@/lib/libmcal.so
-	strip ${DESTDIR}@prefix@/lib/libmcal.a
+	strip ${DESTDIR}@prefix@/lib/$(LIBCAL_SO).$(REV)
+	strip ${DESTDIR}@prefix@/lib/$(LIBCAL)
 
-libmcal.a: $(LIBOBJS)
+$(LIBCAL): $(LIBOBJS)
 	rm -f $(LIBCAL)
 	ar r $(LIBCAL) $(LIBOBJS)
 
-libmcal.so: $(LIBOBJS)
-	rm -f $(LIBCAL_SO)
-	gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
+$(LIBCAL_SO).$(REV): $(LIBOBJS)
+	rm -f $@
+	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(LIBOBJS)
+	strip --strip-unneeded $@
+	rm -f $(LIBCAL_SO).0
+	ln -s $@ $(LIBCAL_SO).0
 
 lex.ical_yy.c: icalscanner.lex
 	$(FLEX) $<
 
-tester: tester.o libmcal.a
-	gcc -Wall -g -o tester tester.o $(LIBCAL) -lcrypt
+tester: tester.o $(LIBCAL)
+	$(CC) $(CFLAGS) -g -o tester tester.o $(LIBCAL) -lcrypt
 
 clean:
 	rm -f *.o *~ core $(LIBCAL) $(LIBCAL_SO) tester installed 
 
 distclean: clean
-	rm -f  config.cache  config.status config.log Makefile drivers.c drivers.h bootstrap.in
+	rm -f config.cache config.status config.log Makefile drivers.c drivers.h bootstrap.in
 
 
 dep: depend