--- rpl/Makefile.am	2012/05/28 11:16:08	1.48
+++ rpl/Makefile.am	2013/02/27 15:06:19	1.61
@@ -11,20 +11,32 @@ EXTRA_DIST = LIMITATIONS Licence_CeCILL_
 		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 [ -n $(shell $(MAKE) -v | grep "^GNU Make") ]; then \
+		echo; \
+		echo MAKE=$(MAKE); \
+		echo "Please use GNU Make !"; \
+		echo; \
+		false; \
+	fi
+	$(MAKE) all-rpl
+
 licences:
 	cp -f $(top_builddir)/COPYING $(srcdir)
 	$(MAKE) -C src $@
 
 toolsdistclean:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-			@FILE@ @ICONV@ @SQLITE@; \
+			@FILE@ @ICONV@ @SQLITE@ @SIGSEGV@ @BUILD_OPENMOTIF@; \
 	do \
 		rm -rf $(srcdir)/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@; \
+			@FILE@ @ICONV@ @SQLITE@ @SIGSEGV@ @BUILD_OPENMOTIF@; \
 	do \
 		$(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \
 	done;
@@ -146,7 +158,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 		{ \
 			if (index($$0, "-static") == 0) \
 			{ \
-				printf("%s -static\n", $$0); \
+				printf("%s -static @ABI@\n", $$0); \
 			} \
 			else \
 			{ \
@@ -157,7 +169,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 		{ \
 			if (index($$0, "CFLAGS") == 1) \
 			{ \
-				printf("CFLAGS = -O2 -g\n"); \
+				printf("CFLAGS = -O2 -g @ABI@\n"); \
 			} \
 			else \
 			{ \
@@ -168,7 +180,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 	mv -f $$TMP tools/@FILE@/src/Makefile
 	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)
 	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
-			$(top_builddir)/tools/@FILE@/src/*.o \
+			@CFLAGS@ $(top_builddir)/tools/@FILE@/src/*.o \
 			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
 			cut -d= -f2) $(LDFLAGS)
 
@@ -177,7 +189,9 @@ $(top_builddir)/tools/@SQLITE@/.libs/@LI
 
 $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
 		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a:
-	if [ ! -f $(top_builddir)/tools/@OPENSSL@/tests_success ]; then \
+	if [ ! -f $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
+			-o ! -f $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a \
+			-o ! -f $(top_builddir)/tools/@OPENSSL@/tests_success ]; then \
 		if [ @OS@ = "OS2" ]; then \
 			(cd $(top_builddir)/tools/@OPENSSL@ && \
 					sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
@@ -205,12 +219,15 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE
 	$(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@UNITS@/units$(EXEEXT):
-	if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
+	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; \
+	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) \
@@ -242,7 +259,7 @@ $(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 \
@@ -267,6 +284,7 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)
 
 debian: all
+	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS) librpl
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/bin
 	for i in $(top_builddir)/src/rpl$(EXEEXT) $(top_builddir)/scripts/rplcc \
 			$(top_builddir)/scripts/rpllink $(top_builddir)/scripts/mkrplso \
@@ -304,9 +322,13 @@ debian: all
 	done
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share
 	cp -f $(top_builddir)/tools/@FILE@/magic/magic.mgc \
-			$(top_builddir)/debian/$(prefix)/share
-	cp -f $(srcdir)/tools/@UNITS@/units.dat \
-			$(top_builddir)/debian/$(prefix)/share
+			$(top_builddir)/debian/$(prefix)/share/rplfiles.mgc
+	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) \