--- rpl/Attic/Makefile.in 2011/10/05 13:14:17 1.54 +++ rpl/Attic/Makefile.in 2011/10/10 10:58:10 1.55 @@ -198,6 +198,7 @@ LIBOBJS = @LIBOBJS@ LIBRPLCAS = @LIBRPLCAS@ LIBS = @LIBS@ LIBXPM = @LIBXPM@ +LIB_PREFIX = @LIB_PREFIX@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -225,6 +226,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSTGRESQL_SUPPORT = @POSTGRESQL_SUPPORT@ POSTSCRIPT_SUPPORT = @POSTSCRIPT_SUPPORT@ PROFILAGE = @PROFILAGE@ +PSELECT = @PSELECT@ RANLIB = @RANLIB@ READLINE = @READLINE@ RPLCAS = @RPLCAS@ @@ -853,7 +855,7 @@ 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 \ @@ -892,8 +894,10 @@ $(top_builddir)/tools/@NCURSES@/lib/libn 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; \ @@ -920,28 +924,20 @@ $(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: +$(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \ + $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.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=tmp.libiconv; \ @@ -949,8 +945,6 @@ $(top_builddir)/tools/@ICONV@/lib/.libs/ $(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 @@ -962,7 +956,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): @@ -970,7 +964,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 + $(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a TMP=tmp.rplfile; \ awk \ '{ \ @@ -997,15 +991,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' \ @@ -1016,17 +1006,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)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a $(MAKE) -C $(top_builddir)/rplsums $(AM_MAKEFLAGS) $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT): @@ -1035,11 +1021,11 @@ $(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 @@ -1048,15 +1034,15 @@ install-strip: $(MAKE) $(AM_MAKEFLAGS) install $(top_builddir)/rplcas/lib/librplcas.a: \ - $(top_builddir)/tools/@GSL@/.libs/libgsl.a + $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.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 \ - $(top_builddir)/tools/@GSL@/.libs/libgsl.a \ - $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a \ - $(top_builddir)/tools/@OPENSSL@/libcrypto.a \ +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 \