--- rpl/Makefile.am 2011/04/15 15:21:36 1.24.2.1 +++ rpl/Makefile.am 2011/10/05 13:14:17 1.31 @@ -1,4 +1,4 @@ -SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack src \ +SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack rplcas src \ rpltags scripts man doc include_HEADERS = rplconfig.h @@ -7,11 +7,13 @@ EXTRA_DIST = LIMITATIONS Licence_CeCILL_ 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 + examples/external.tar.gz \ + rplcas/@GMP@.tar.gz rplcas/@MPFR@.tar.gz rplcas/@NTL@.tar.gz \ + rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz licences: cp -f $(top_builddir)/COPYING $(srcdir) - make -C src $@ + $(MAKE) -C src $@ toolsdistclean: for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ @@ -32,7 +34,7 @@ $(top_builddir)/tools/@NCURSES@/lib/libn -exec grep static {} /dev/null \; | cut -d: -f1); \ do \ echo -n Checking $$i; \ - TMP=$$(mktemp tmp.XXXXXXXXXX); \ + TMP=tmp.ncurses; \ if [ -n "$$(grep static $$i | grep dynamic)" ]; then \ awk \ '{ \ @@ -63,7 +65,7 @@ $(top_builddir)/tools/@NCURSES@/lib/libn for i in tools/@NCURSES@/test/Makefile; \ do \ echo -n Checking $$i; \ - TMP=$$(mktemp tmp.XXXXXXXXXX); \ + TMP=tmp.ncurses_test; \ awk \ '/^TEST_ARGS/ \ { printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \ @@ -74,7 +76,7 @@ $(top_builddir)/tools/@NCURSES@/lib/libn echo .; \ done; if [ @OS@ = "OS2" ]; then \ - TMP=$$(mktemp tmp.XXXXXXXXXX); \ + TMP=tmp.ncurses_test_os2); \ awk \ '/^CXX_AR[ \t]/ \ { printf("CXX_AR = $(AR)\n"); } \ @@ -118,7 +120,7 @@ $(top_builddir)/tools/@GSL@/.libs/libgsl $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a: # La dépendance est faite par rpliconv. if [ @OS@ = "OS2" ]; then \ - TMP=$$(mktemp tmp.XXXXXXXXXX); \ + TMP=tmp.libiconv; \ awk '! /^[ \t]cd po/ { print; }' \ $(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \ mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \ @@ -145,7 +147,7 @@ $(top_builddir)/rplawk/rplawk$(EXEEXT): $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ $(top_builddir)/tools/@FILE@/magic/magic.mgc: \ $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a - TMP=$$(mktemp tmp.XXXXXXXXXX); \ + TMP=tmp.rplfile; \ awk \ '{ \ if (index($$0, "LDFLAGS") == 1) \ @@ -221,6 +223,10 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE install-strip: $(MAKE) $(AM_MAKEFLAGS) install +$(top_builddir)/rplcas/lib/librplcas.a: \ + $(top_builddir)/tools/@GSL@/.libs/libgsl.a + $(MAKE) -C $(top_builddir)/rplcas $(AM_MAKEFLAGS) + all: $(top_builddir)/tools/@NCURSES@/lib/libncurses.a \ $(top_builddir)/tools/@READLINE@/libreadline.a \ $(top_builddir)/tools/@READLINE@/libhistory.a \ @@ -234,9 +240,10 @@ all: $(top_builddir)/tools/@NCURSES@/lib $(top_builddir)/rplawk/rplawk$(EXEEXT) \ $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ $(top_builddir)/tools/@FILE@/magic/magic.mgc \ - $(top_builddir)/tools/rplsums/rplmd5sum \ - $(top_builddir)/tools/rplsums/rplsha1sum \ - $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) + $(top_builddir)/tools/rplsums/rplmd5sum$(EXEEXT) \ + $(top_builddir)/tools/rplsums/rplsha1sum$(EXEEXT) \ + $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \ + @LIBRPLCAS@ # 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)