--- rpl/Makefile.am	2013/02/27 15:06:19	1.61
+++ rpl/Makefile.am	2013/03/05 23:05:42	1.64
@@ -12,7 +12,7 @@ EXTRA_DIST = LIMITATIONS Licence_CeCILL_
 		rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz
 
 all:
-	@if [ -n $(shell $(MAKE) -v | grep "^GNU Make") ]; then \
+	@if [ x$(shell $(MAKE) -v | grep "^GNU Make") != x ]; then \
 		echo; \
 		echo MAKE=$(MAKE); \
 		echo "Please use GNU Make !"; \
@@ -25,21 +25,30 @@ licences:
 	cp -f $(top_builddir)/COPYING $(srcdir)
 	$(MAKE) -C src $@
 
-toolsdistclean:
+purge:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 			@FILE@ @ICONV@ @SQLITE@ @SIGSEGV@ @BUILD_OPENMOTIF@; \
 	do \
 		rm -rf $(srcdir)/tools/$$i; \
+		rm -rf $(top_builddir)/tools/$$i; \
 	done;
-	rm -f $(top_builddir)/tools/openmotif.lib
-	rm -rf $(top_builddir)/tools/@OPENSSL@
-
-toolsclean:
-	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-			@FILE@ @ICONV@ @SQLITE@ @SIGSEGV@ @BUILD_OPENMOTIF@; \
+	for i in @GMP@ @MPFR@ @NTL@ @COCOA@ @PARI@ @GIAC@; \
 	do \
-		$(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \
+		if [ -d $(srcdir)/rplcas/$$i ]; then \
+			rm -rf $(srcdir)/rplcas/$$i; \
+		fi; \
+		if [ -d $(top_builddir)/rplcas/$$i ]; then \
+			rm -rf $(top_builddir)/rplcas/$$i; \
+		fi; \
 	done;
+	for i in bin lib include share; \
+	do \
+		if [ -d $(top_builddir)/rplcas/$$i ]; then \
+			rm -rf $(top_builddir)/rplcas/$$i; \
+		fi; \
+	done;
+	rm -f $(top_builddir)/tools/openmotif.lib
+	rm -rf $(top_builddir)/tools/@OPENSSL@
 
 $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a:
 	for i in $(shell find tools/@NCURSES@ -name Makefile \