Index: apron/apron/apron/Makefile
===================================================================
--- apron.orig/apron/apron/Makefile	2009-12-06 15:00:18.000000000 +0100
+++ apron/apron/apron/Makefile	2009-12-06 15:00:18.000000000 +0100
@@ -133,7 +133,7 @@
 
 libapron.so: $(C_FILES:%.c=%.o) $(C_FILES_AUX:%.c=%MPQ.o) $(C_FILES_AUX:%.c=%D.o)  $(C_FILES_AUX:%.c=%MPFR.o) ../itv/libitv.a
 	for i in `$(AR) t ../itv/libitv.a`; do ln -s ../itv/$$i $$i; done
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@.0 -o $@ $(C_FILES:%.c=%.o) $(C_FILES_AUX:%.c=%MPQ.o) $(C_FILES_AUX:%.c=%D.o) $(C_FILES_AUX:%.c=%MPFR.o) `$(AR) t ../itv/libitv.a`
+	$(CC) $(CFLAGS) -lm -lmpfr -lgmp -shared -Wl,-soname,$@.0 -o $@ $(C_FILES:%.c=%.o) $(C_FILES_AUX:%.c=%MPQ.o) $(C_FILES_AUX:%.c=%D.o) $(C_FILES_AUX:%.c=%MPFR.o) `$(AR) t ../itv/libitv.a`
 	for i in `$(AR) t ../itv/libitv.a`; do $(RM) $$i; done
 
 libapron_debug.so: $(C_FILES:%.c=%_debug.o) $(C_FILES_AUX:%.c=%MPQ_debug.o) $(C_FILES_AUX:%.c=%D_debug.o) $(C_FILES_AUX:%.c=%MPFR_debug.o) ../itv/libitv_debug.a
Index: apron/apron/box/Makefile
===================================================================
--- apron.orig/apron/box/Makefile	2009-12-06 15:00:18.000000000 +0100
+++ apron/apron/box/Makefile	2009-12-06 15:04:33.000000000 +0100
@@ -151,7 +151,7 @@
 	$(AR) rcs $@ $^
 	$(RANLIB) $@
 libbox%.so:  $(subst .c,%.o,$(CCMODULES:%=%.c))
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
+	$(CC) $(CFLAGS) -L../apron -lm -lgmp -lmpfr -lapron -shared -Wl,-soname,$@.0 -o $@ $^
 libbox%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
 	$(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
 
Index: apron/apron/newpolka/Makefile
===================================================================
--- apron.orig/apron/newpolka/Makefile	2009-12-06 15:00:18.000000000 +0100
+++ apron/apron/newpolka/Makefile	2009-12-06 15:03:49.000000000 +0100
@@ -176,7 +176,7 @@
 	$(AR) rcs $@ $^
 	$(RANLIB) $@
 libpolka%.so:  $(subst .c,%.o,$(CCMODULES:%=%.c))
-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
+	$(CC) $(CFLAGS) -L../apron -lgmp -lapron -shared -Wl,-soname,$@.0 -o $@ $^
 libpolka%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
 	$(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
 
Index: apron/apron/octagons/Makefile
===================================================================
--- apron.orig/apron/octagons/Makefile	2009-12-06 15:00:18.000000000 +0100
+++ apron/apron/octagons/Makefile	2009-12-06 15:05:19.000000000 +0100
@@ -174,7 +174,7 @@
 	$(RANLIB) $@
 
 liboct%.so: $(subst .c,%.o,$(CCSOURCES))
-	$(SHARED) -Wl,-soname,$@.0 -o $@ $^
+	$(SHARED) -L../apron -lm -lgmp -lmpfr -lapron -Wl,-soname,$@.0 -o $@ $^
 
 octtest%: liboct%_debug.a oct_test%.o
 	$(CC) $(CFLAGS_DEBUG) $(ICFLAGS) -o $@ oct_test$*.o \
Index: apron/apron/ppl/Makefile
===================================================================
--- apron.orig/apron/ppl/Makefile	2009-12-06 15:00:18.000000000 +0100
+++ apron/apron/ppl/Makefile	2009-12-06 15:10:51.000000000 +0100
@@ -126,7 +126,7 @@
 	$(AR) rcs $@ $^
 	$(RANLIB) $@
 libap_ppl.so: $(subst .cc,.o,$(CXXSOURCES))
-	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
+	$(CXX) $(CXXFLAGS) -L../apron -lgmp -lapron -shared -Wl,-soname,$@.0 -o $@ $^ -lppl -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
 libap_ppl_debug.so: $(subst .cc,_debug.o,$(CXXSOURCES))
 	$(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
 
@@ -181,7 +181,7 @@
 	$(AR) rcs $@ $^
 	$(RANLIB) $@
 libap_ppl_caml.so: ap_ppl_caml.o libap_ppl.so
-	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_ppl -lppl -lgmpxx -L. -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
+	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_ppl -L. -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
 libap_ppl_caml_debug.so: ap_ppl_caml_debug.o libap_ppl_debug.so
 	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_ppl_debug -lppl -lgmpxx -L. -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
 dllap_ppl_caml.so: libap_ppl_caml.so
Index: apron/apron/products/Makefile
===================================================================
--- apron.orig/apron/products/Makefile	2009-12-06 15:00:18.000000000 +0100
+++ apron/apron/products/Makefile	2009-12-06 15:13:48.000000000 +0100
@@ -109,7 +109,7 @@
 	$(AR) rcs $@ $^
 	$(RANLIB) $@
 libap_pkgrid.so: ap_pkgrid.o
-	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
+	$(CXX) $(CXXFLAGS) -L../apron -L../ppl -L../newpolka -lgmp -lapron -lap_ppl -lpolkaMPQ -shared -Wl,-soname,$@.0 -o $@ $^
 libap_pkgrid_debug.so: ap_pkgrid_debug.o
 	$(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
 
