--- rpl/Makefile.am 2011/04/20 08:26:01 1.26 +++ rpl/Makefile.am 2011/11/15 07:01:35 1.36 @@ -1,3 +1,5 @@ +V=0 + SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack rplcas src \ rpltags scripts man doc @@ -8,11 +10,12 @@ EXTRA_DIST = LIMITATIONS Licence_CeCILL_ 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 \ - rplcas/@GMP@.tar.gz @MPFR@.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@ \ @@ -28,12 +31,12 @@ toolsclean: $(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \ done; -$(top_builddir)/tools/@NCURSES@/lib/libncurses.a: +$(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a: for i in $(shell find tools/@NCURSES@ -name Makefile \ -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 \ '{ \ @@ -64,18 +67,20 @@ $(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 "); \ - printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \ + { printf("TEST_ARGS = ../lib/@LIB_PREFIX@form.a \ + ../lib/@LIB_PREFIX@menu.a "); \ + printf("../lib/@LIB_PREFIX@panel.a \ + ../lib/@LIB_PREFIX@ncurses.a\n"); } \ ! /^TEST_ARGS/ \ { print; }' tools/@NCURSES@/test/Makefile > $$TMP; \ mv -f $$TMP $$i; \ echo .; \ done; if [ @OS@ = "OS2" ]; then \ - TMP=$$(mktemp tmp.XXXXXXXXXX); \ + TMP=tmp.ncurses_test_os2; \ awk \ '/^CXX_AR[ \t]/ \ { printf("CXX_AR = $(AR)\n"); } \ @@ -95,37 +100,27 @@ $(top_builddir)/tools/@NCURSES@/lib/libn mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \ fi; $(MAKE) -C $(top_builddir)/tools/@NCURSES@ $(AM_MAKEFLAGS) - if [ @OS@ = "OS2" ]; then \ - cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \ - $(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \ - fi $(top_builddir)/tools/@READLINE@/libreadline.a \ $(top_builddir)/tools/@READLINE@/libhistory.a: $(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS) -$(top_builddir)/tools/@GSL@/.libs/libgsl.a: +$(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a: # Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"} # dans ltmain.sh et propager les modifications dans le script libtool. if [ @OS@ = "OS2" ]; then \ (cd $(top_builddir)/tools/@GSL@ && configure --disable-shared;); \ fi $(MAKE) -C $(top_builddir)/tools/@GSL@ $(AM_MAKEFLAGS) - if [ @OS@ = "OS2" ]; then \ - cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \ - $(top_builddir)/tools/@GSL@/.libs/libgsl.a; \ - fi -$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a: +$(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.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; \ $(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \ - cp -f $(top_builddir)/tools/@ICONV@/lib/.libs/iconv.a \ - $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a; \ else \ $(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \ fi @@ -137,7 +132,7 @@ $(top_builddir)/lapack/blas/libblas.a: (cd $(top_builddir)/lapack/blas && $(MAKE) $(AM_MAKEFLAGS)) $(top_builddir)/rpliconv/rpliconv$(EXEEXT): \ - $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a + $(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a $(MAKE) -C $(top_builddir)/rpliconv $(AM_MAKEFLAGS) $(top_builddir)/rplawk/rplawk$(EXEEXT): @@ -145,8 +140,8 @@ $(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); \ + $(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a + TMP=tmp.rplfile; \ awk \ '{ \ if (index($$0, "LDFLAGS") == 1) \ @@ -172,15 +167,11 @@ $(top_builddir)/tools/@FILE@/src/rplfile $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \ cut -d= -f2) $(LDFLAGS) -$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a: +$(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a: $(MAKE) -C $(top_builddir)/tools/@SQLITE@ $(AM_MAKEFLAGS) - if [ @OS@ = "OS2" ]; then \ - cp $(top_builddir)/tools/@SQLITE@/.libs/sqlite3.a \ - $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a; \ - fi -$(top_builddir)/tools/@OPENSSL@/libcrypto.a \ - $(top_builddir)/tools/@OPENSSL@/libssl.a: +$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \ + $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a: if [ @OS@ = "OS2" ]; then \ (cd $(top_builddir)/tools/@OPENSSL@ && \ sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \ @@ -191,17 +182,13 @@ $(top_builddir)/tools/@OPENSSL@/libcrypt sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \ > OS2-EMX.mak2; \ $(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \ - cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \ - $(top_builddir)/tools/@OPENSSL@/libssl.a; \ - cp $(top_builddir)/tools/@OPENSSL@/out/crypto.a \ - $(top_builddir)/tools/@OPENSSL@/libcrypto.a; \ else \ (cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \ fi -$(top_builddir)/tools/rplsums/rplmd5sum \ - $(top_builddir)/tools/rplsums/rplsha1sum: \ - $(top_builddir)/tools/@OPENSSL@/libcrypto.a +$(top_builddir)/rplsums/rplmd5sum \ + $(top_builddir)/rplsums/rplsha1sum: \ + $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a $(MAKE) -C $(top_builddir)/rplsums $(AM_MAKEFLAGS) $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT): @@ -210,24 +197,28 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ $(top_builddir)/tools/@FILE@/magic/magic.mgc -.NOTPARALLEL: $(top_builddir)/tools/@READLINE@/libreadline.a \ - $(top_builddir)/tools/@READLINE@/libhistory.a +.NOTPARALLEL: $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \ + $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a -.NOTPARALLEL: $(top_builddir)/tools/@OPENSSL@/libcrypto.a \ - $(top_builddir)/tools/@OPENSSL@/libssl.a +.NOTPARALLEL: $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \ + $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a -.NOTPARALLEL: $(top_builddir)/tools/rplsums/rplmd5sum \ - $(top_builddir)/tools/rplsums/rplsha1sum +.NOTPARALLEL: $(top_builddir)/rplsums/rplmd5sum \ + $(top_builddir)/rplsums/rplsha1sum install-strip: $(MAKE) $(AM_MAKEFLAGS) install -all: $(top_builddir)/tools/@NCURSES@/lib/libncurses.a \ - $(top_builddir)/tools/@READLINE@/libreadline.a \ - $(top_builddir)/tools/@READLINE@/libhistory.a \ - $(top_builddir)/tools/@GSL@/.libs/libgsl.a \ - $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a \ - $(top_builddir)/tools/@OPENSSL@/libcrypto.a \ +$(top_builddir)/rplcas/lib/librplcas.a: \ + $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a + $(MAKE) -C $(top_builddir)/rplcas $(AM_MAKEFLAGS) + +all: $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a \ + $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \ + $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a \ + $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a \ + $(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a \ + $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \ $(top_builddir)/tools/@OPENSSL@/libssl.a \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ @@ -235,11 +226,11 @@ 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)/rplsums/rplmd5sum$(EXEEXT) \ + $(top_builddir)/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)/rplcas $(AM_MAKEFLAGS) $(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS) $(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)