--- rpl/Makefile.am 2010/04/21 13:45:06 1.8 +++ rpl/Makefile.am 2010/05/19 09:22:32 1.11 @@ -1,4 +1,4 @@ -SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack src \ +SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack ptmalloc3 src \ rpltags scripts man doc EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \ @@ -60,6 +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; (cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS)) $(top_builddir)/tools/@READLINE@/libreadline.a \ @@ -115,6 +128,9 @@ $(top_builddir)/tools/@OPENSSL@/libcrypt $(top_builddir)/tools/@OPENSSL@/libssl.a: (cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) $(AM_MAKEFLAGS)) +$(top_builddir)/ptmalloc3/libptmalloc3.a : + (cd $(top_builddir)/ptmalloc3 && $(MAKE) $(AM_MAKEFLAGS)) + $(top_builddir)/tools/rplsums/rplmd5sum \ $(top_builddir)/tools/rplsums/rplsha1sum: \ $(top_builddir)/tools/@OPENSSL@/libcrypto.a @@ -144,6 +160,7 @@ 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 \ $(top_builddir)/tools/@FILE@/src/rplfile \ $(top_builddir)/tools/@FILE@/magic/magic.mgc \