--- rpl/Attic/Makefile.in 2010/08/09 13:52:11 1.27 +++ rpl/Attic/Makefile.in 2010/09/07 20:59:04 1.34 @@ -134,6 +134,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BROKEN_SIGINFO = @BROKEN_SIGINFO@ +BSH_PATH = @BSH_PATH@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -180,6 +182,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IPCS_SYSV = @IPCS_SYSV@ +IPV6 = @IPV6@ LATEX = @LATEX@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -212,7 +216,6 @@ READLINE = @READLINE@ RUNPATH = @RUNPATH@ SED = @SED@ SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@ -SEMAPHORES_SYSV = @SEMAPHORES_SYSV@ SEMUN = @SEMUN@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -292,7 +295,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack ptmalloc3 src \ +SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack ptmalloc3 src \ rpltags scripts man doc EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \ @@ -816,7 +819,7 @@ toolsdistclean: for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ @FILE@ @ICONV@ @SQLITE@; \ do \ - \rm -rf $(srcdir)/tools/$$i; \ + rm -rf $(srcdir)/tools/$$i; \ done; toolsclean: @@ -851,11 +854,11 @@ $(top_builddir)/tools/@NCURSES@/lib/libn print; \ } \ }' $$i > $$TMP; \ - \mv -f $$TMP $$i; \ + mv -f $$TMP $$i; \ echo -n " (fixed)"; \ else \ echo -n " (nothing to do)"; \ - \rm -f $$TMP; \ + rm -f $$TMP; \ fi; \ echo .; \ done; @@ -869,7 +872,7 @@ $(top_builddir)/tools/@NCURSES@/lib/libn # printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \ # ! /^TEST_ARGS/ \ # { print; }' tools/@NCURSES@/test/Makefile > $$TMP; \ -# \mv -f $$TMP $$i; \ +# mv -f $$TMP $$i; \ # echo .; \ # done; if [ @OS@ = "OS2" ]; then \ @@ -890,11 +893,11 @@ $(top_builddir)/tools/@NCURSES@/lib/libn { printf("CXX = g++\n"); } \ ! /^CXX[ \t]/ \ { print; }' > $$TMP; \ - \mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \ + 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 \ + cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \ $(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \ fi @@ -903,12 +906,14 @@ $(top_builddir)/tools/@READLINE@/libread $(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS) $(top_builddir)/tools/@GSL@/.libs/libgsl.a: - if [ @OS@ == "OS2" ]; then \ - (cp $(top_builddir)/tools/@GSL@ && ./configure --disable-shared); \ +# 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 \ + if [ @OS@ = "OS2" ]; then \ + cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \ $(top_builddir)/tools/@GSL@/.libs/libgsl.a; \ fi @@ -918,9 +923,9 @@ $(top_builddir)/tools/@ICONV@/lib/.libs/ TMP=$$(mktemp tmp.XXXXXXXXXX); \ awk '! /^[ \t]cd po/ { print; }' \ $(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \ - \mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \ + 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 \ + 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; \ @@ -936,6 +941,9 @@ $(top_builddir)/rpliconv/rpliconv$(EXEEX $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a $(MAKE) -C $(top_builddir)/rpliconv $(AM_MAKEFLAGS) +$(top_builddir)/rplawk/rplawk$(EXEEXT): + $(MAKE) -C $(top_builddir)/rplawk $(AM_MAKEFLAGS) + $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ $(top_builddir)/tools/@FILE@/magic/magic.mgc: \ $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a @@ -958,7 +966,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile print; \ } \ }' tools/@FILE@/src/Makefile > $$TMP; \ - \mv -f $$TMP tools/@FILE@/src/Makefile + mv -f $$TMP tools/@FILE@/src/Makefile $(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS) $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a: @@ -980,9 +988,9 @@ $(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 \ + cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \ $(top_builddir)/tools/@OPENSSL@/libssl.a; \ - \cp $(top_builddir)/tools/@OPENSSL@/out/crypto.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)); \ @@ -1025,6 +1033,7 @@ all: $(top_builddir)/tools/@NCURSES@/lib $(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) \ $(top_builddir)/tools/@FILE@/magic/magic.mgc \ $(top_builddir)/tools/rplsums/rplmd5sum \ @@ -1034,6 +1043,7 @@ 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.