--- Makefile	2006-04-05 19:10:40.000000000 +0200
+++ Makefile.oden	2006-07-14 16:28:00.000000000 +0200
@@ -2,7 +2,8 @@
 OBJECTS=session.o queries.o parsing.o format.o objects.o
 DBGOBJ=session-dbg.o queries-dbg.o parsing-dbg.o format-dbg.o objects-dbg.o
 DBGFLAGS=-DEBUG -g
-FLAGS=-Wall -DUSE_SSL -Os
+CFLAGS=$(RPM_OPT_FLAGS) -fPIC -Wall -DUSE_SSL
+CC=gcc
 LDFLAGS=-lssl -lcrypto
 RM=rm -f
 
@@ -18,14 +19,14 @@
 	@echo "$$ make FLAGS='-Wall -DWIN32 -0s' LDFLAGS='-lwsock32'"
 	@echo "and use examples/winpoptest*.c as examples of use"
 %.o : %.c
-	gcc ${FLAGS} -c $<
+	$(CC) ${CFLAGS} -c $<
 %-dbg.o : %.c
-	gcc -o $@ -c ${FLAGS} ${DBGFLAGS} $<
+	$(CC) -o $@ -c ${CFLAGS} ${DBGFLAGS} $<
 libspopc-dbg.a : $(DBGOBJ)
 	ar r $@ $(DBGOBJ)
 	ranlib $@
 %-dbg : examples/%.c
-	gcc -I. -o $@ $(DBGFLAGS) ${FLAGS} \
+	$(CC) -I. -o $@ $(DBGFLAGS) ${FLAGS} \
 	$< -L. -lspopc-dbg $(LDFLAGS)
 debug: libspopc-dbg.a poptest1-dbg poptest2-dbg butcher-dbg
 libspopc.a : $(OBJECTS)
@@ -35,10 +36,12 @@
 	ln -s libspopc-${VERSION}.a libspopc.a
 libspopc.so : $(OBJECTS)
 	${RM} libspopc*.so
-	gcc -o libspopc-${VERSION}.so -shared ${OBJECTS}
-	ln -s libspopc-${VERSION}.so libspopc.so
+	$(CC) -shared -Wl,-soname,libspopc.so.0 $(CFLAGS) -o libspopc.so.$(VERSION) $(OBJECTS)
+	ln -s libspopc.so.$(VERSION) libspopc.so.0.7
+	ln -s libspopc.so.$(VERSION) libspopc.so.0
+	ln -s libspopc.so.$(VERSION) libspopc.so
 %: examples/%.c
-	gcc -o $@ ${FLAGS} $< -L. -lspopc $(LDFLAGS)
+	$(CC) -o $@ ${FLAGS} $< -L. -lspopc $(LDFLAGS)
 examples: libspopc.a poptest1 poptest2 butcher
 uninstall :
 	${RM} ${DESTDIR}/usr/lib/libspopc*.a