--- rpl/Attic/Makefile.in	2010/09/07 20:59:04	1.34
+++ rpl/Attic/Makefile.in	2010/09/23 15:17:26	1.37
@@ -191,7 +191,6 @@ LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MALLOC = @MALLOC@
 MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
@@ -295,7 +294,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack ptmalloc3 src \
+SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack src \
 		rpltags scripts man doc
 
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
@@ -862,19 +861,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 \
@@ -968,6 +967,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)
@@ -996,9 +999,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
@@ -1031,7 +1031,6 @@ 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) \
@@ -1043,7 +1042,6 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 	$(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)
-	if [ @OS@ = "OpenBSD" ]; then chmod 755 install-sh; fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.