--- rpl/Makefile.am	2012/12/14 12:30:20	1.57
+++ rpl/Makefile.am	2013/03/21 14:13:55	1.67
@@ -4,32 +4,52 @@ SUBDIRS = tools rplsums rpliconv rplawk
 include_HEADERS = rplconfig.h
 
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
-		COPYING.in lapack/COPYING lapack/RELEASE autogen.sh \
+		HEADER.in lapack/COPYING lapack/RELEASE autogen.sh \
 		tests/tests.tar.gz vim/indent/rpl.vim vim/ftplugin/rpl.vim \
 		vim/syntax/rpl.vim examples/obele.rpl examples/appel.tar.gz \
 		examples/external.tar.gz DEBIAN/control.in \
 		rplcas/@GMP@.tar.gz rplcas/@MPFR@.tar.gz rplcas/@NTL@.tar.gz \
 		rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz
 
+all:
+	@if [ x$(shell $(MAKE) -v | grep "^GNU Make") != x ]; then \
+		echo; \
+		echo MAKE=$(MAKE); \
+		echo "Please use GNU Make !"; \
+		echo; \
+		false; \
+	fi
+	$(MAKE) all-rpl
+
 licences:
-	cp -f $(top_builddir)/COPYING $(srcdir)
+	cp -f $(top_builddir)/HEADER $(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@
+	rm -rf $(top_builddir)/tools/@ZLIB@
 
 $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a:
 	for i in $(shell find tools/@NCURSES@ -name Makefile \
@@ -105,6 +125,9 @@ $(top_builddir)/tools/@READLINE@/libread
 		$(top_builddir)/tools/@READLINE@/libhistory.a:
 	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
+$(top_builddir)/tools/@ZLIB@/libz.a:
+	$(MAKE) -C $(top_builddir)/tools/@ZLIB@ $(AM_MAKEFLAGS)
+
 $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a:
 # Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"}
 # dans ltmain.sh et propager les modifications dans le script libtool.
@@ -208,14 +231,17 @@ $(top_builddir)/rplsums/rplmd5sum$(EXEEX
 $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT):
 	$(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)
 
-$(top_builddir)/tools/@UNITS@/units$(EXEEXT):
-	if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
+$(top_builddir)/tools/@UNITS@/units$(EXEEXT) \
+		$(top_builddir)/tools/@UNITS@/units_cur:
+	if [ @OS@ = OpenBSD ]; then \
 		TMP=tmp.units; \
 		sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
 				@UNITS@/Makefile > $$TMP; \
 		mv -f $$TMP @UNITS@/Makefile; \
 	fi; \
-	cp -f $(srcdir)/tools/@UNITS@/units_cur $(top_builddir)/tools/@UNITS@
+	if [ x$(srcdir) != x$(top_builddir) ]; then \
+		cp -f $(srcdir)/tools/@UNITS@/units_cur $(top_builddir)/tools/@UNITS@; \
+	fi
 	$(MAKE) -C $(top_builddir)/tools/@UNITS@ $(AM_MAKEFLAGS)
 
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
@@ -247,13 +273,14 @@ $(top_builddir)/tools/@LIBXPM@/src/.libs
 $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a:
 	$(MAKE) -C $(top_builddir)/tools/@SIGSEGV@ $(AM_MAKEFLAGS)
 
-all: $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a \
+all-rpl: $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a \
 		$(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \
 		$(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a \
 		$(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a \
 		$(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a \
 		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
 		$(top_builddir)/tools/@OPENSSL@/libssl.a \
+		$(top_builddir)/tools/@ZLIB@/libz.a \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
@@ -266,13 +293,6 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT) \
 		$(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a \
 		@LIBRPLCAS@ @LIBMOTIF@
-	@if [ -n $(shell $(MAKE) -v | grep "^GNU Make") ]; then \
-		echo; \
-		echo MAKE=$(MAKE); \
-		echo "Please use GNU Make !"; \
-		echo; \
-		false; \
-	fi
 # Cette règle n'est là que pour forcer la compilation de Gnuplot.
 	$(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)
@@ -318,8 +338,12 @@ debian: all
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share
 	cp -f $(top_builddir)/tools/@FILE@/magic/magic.mgc \
 			$(top_builddir)/debian/$(prefix)/share/rplfiles.mgc
-	cp -f $(srcdir)/tools/@UNITS@/units.dat \
-			$(top_builddir)/debian/$(prefix)/share
+	cp -f $(srcdir)/tools/@UNITS@/definitions.units \
+			$(top_builddir)/debian/$(prefix)/share/rplunits.tmp
+	sed 's/^!include currency.units//g' \
+			$(top_builddir)/debian/$(prefix)/share/rplunits.tmp \
+			> $(top_builddir)/debian/$(prefix)/share/rplunits
+	rm -f $(top_builddir)/debian/$(prefix)/share/rplunits.tmp
 	if [ -e $(top_builddir)/tools/@GNUPLOT@/src/gnuplot$(EXEEXT) ]; then \
 		if [ -e $(prefix)/bin/gnuplot$(EXEEXT) ]; then \
 			mv -f $(prefix)/bin/gnuplot$(EXEEXT) \