--- rpl/Makefile.am	2010/08/13 21:02:18	1.17
+++ rpl/Makefile.am	2011/04/15 15:21:36	1.24.2.1
@@ -1,14 +1,14 @@
-SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack ptmalloc3 src \
+SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack src \
 		rpltags scripts man doc
 
+include_HEADERS = rplconfig.h
+
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
 		COPYING.in lapack/COPYING lapack/RELEASE \
 		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
 
-include_HEADERS = rplconfig.h
-
 licences:
 	cp -f $(top_builddir)/COPYING $(srcdir)
 	make -C src $@
@@ -60,19 +60,19 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 		fi; \
 		echo .; \
 	done;
-#	for i in tools/@NCURSES@/test/Makefile; \
-#	do \
-#		echo -n Checking $$i; \
-#		TMP=$$(mktemp tmp.XXXXXXXXXX); \
-#		awk \
-#			'/^TEST_ARGS/ \
-#				{ printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \
-#				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
-#			! /^TEST_ARGS/ \
-#				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
-#		mv -f $$TMP $$i; \
-#		echo .; \
-#	done;
+	for i in tools/@NCURSES@/test/Makefile; \
+	do \
+		echo -n Checking $$i; \
+		TMP=$$(mktemp tmp.XXXXXXXXXX); \
+		awk \
+			'/^TEST_ARGS/ \
+				{ printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \
+				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
+			! /^TEST_ARGS/ \
+				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
+		mv -f $$TMP $$i; \
+		echo .; \
+	done;
 	if [ @OS@ = "OS2" ]; then \
 		TMP=$$(mktemp tmp.XXXXXXXXXX); \
 		awk \
@@ -139,6 +139,9 @@ $(top_builddir)/rpliconv/rpliconv$(EXEEX
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 	$(MAKE) -C $(top_builddir)/rpliconv $(AM_MAKEFLAGS)
 
+$(top_builddir)/rplawk/rplawk$(EXEEXT):
+	$(MAKE) -C $(top_builddir)/rplawk $(AM_MAKEFLAGS)
+
 $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc: \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
@@ -163,6 +166,10 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 	}' tools/@FILE@/src/Makefile > $$TMP; \
 	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 \
+			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
+			cut -d= -f2) $(LDFLAGS)
 
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
 	$(MAKE) -C $(top_builddir)/tools/@SQLITE@ $(AM_MAKEFLAGS)
@@ -191,9 +198,6 @@ $(top_builddir)/tools/@OPENSSL@/libcrypt
 		(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \
 	fi
 
-$(top_builddir)/ptmalloc3/libptmalloc3.a :
-	$(MAKE) -C $(top_builddir)/ptmalloc3 $(AM_MAKEFLAGS)
-
 $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum: \
 		$(top_builddir)/tools/@OPENSSL@/libcrypto.a
@@ -226,8 +230,8 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 		$(top_builddir)/tools/@OPENSSL@/libssl.a \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
-		$(top_builddir)/ptmalloc3/libptmalloc3.a \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc \
 		$(top_builddir)/tools/rplsums/rplmd5sum \