--- rpl/Makefile.am	2012/05/14 19:30:02	1.47
+++ rpl/Makefile.am	2012/07/03 09:24:21	1.53
@@ -4,7 +4,7 @@ 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 \
+		COPYING.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 \
@@ -146,7 +146,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 +157,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 +168,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 +177,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' \
@@ -261,12 +263,17 @@ 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 $($(MAKE) -v | grep "^GNU Make") ]; then \
+		@echo "Please use GNU Make"; \
+		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)
 	$(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,7 +311,7 @@ debian: all
 	done
 	$(MKDIR_P) $(top_builddir)/debian/$(prefix)/share
 	cp -f $(top_builddir)/tools/@FILE@/magic/magic.mgc \
-			$(top_builddir)/debian/$(prefix)/share
+			$(top_builddir)/debian/$(prefix)/share/rplfiles.mgc
 	cp -f $(srcdir)/tools/@UNITS@/units.dat \
 			$(top_builddir)/debian/$(prefix)/share
 	if [ -e $(top_builddir)/tools/@GNUPLOT@/src/gnuplot$(EXEEXT) ]; then \