--- rpl/Attic/Makefile.in 2010/05/23 15:12:12 1.19 +++ rpl/Attic/Makefile.in 2010/12/21 13:56:31 1.38 @@ -14,7 +14,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -36,12 +35,11 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \ - $(srcdir)/COPYING.in $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/rplconfig.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh ltmain.sh \ - missing mkinstalldirs +DIST_COMMON = README $(am__configure_deps) $(srcdir)/COPYING.in \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/rplconfig.h.in $(top_srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \ + depcomp install-sh ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -61,29 +59,6 @@ RECURSIVE_TARGETS = all-recursive check- install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(includedir)" -HEADERS = $(include_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -134,6 +109,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BROKEN_SIGINFO = @BROKEN_SIGINFO@ +BSH_PATH = @BSH_PATH@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -143,6 +120,7 @@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +C_STANDARD = @C_STANDARD@ DATE = @DATE@ DATE_FR = @DATE_FR@ DEBUG = @DEBUG@ @@ -156,6 +134,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@ EXPORT_DYNAMIC = @EXPORT_DYNAMIC@ +EXT_SQL = @EXT_SQL@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ @@ -178,6 +157,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@ @@ -210,6 +191,7 @@ READLINE = @READLINE@ RUNPATH = @RUNPATH@ SED = @SED@ SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@ +SEMUN = @SEMUN@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SQLITE = @SQLITE@ @@ -288,7 +270,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 src \ rpltags scripts man doc EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \ @@ -297,7 +279,6 @@ EXTRA_DIST = LIMITATIONS Licence_CeCILL_ vim/syntax/rpl.vim examples/obele.rpl examples/appel.tar.gz \ examples/external.tar.gz -include_HEADERS = rplconfig.h all: rplconfig.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -355,26 +336,6 @@ distclean-hdr: -rm -f rplconfig.h stamp-h1 COPYING: $(top_builddir)/config.status $(srcdir)/COPYING.in cd $(top_builddir) && $(SHELL) ./config.status $@ -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -688,12 +649,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile $(HEADERS) rplconfig.h +all-am: Makefile rplconfig.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -735,7 +693,7 @@ info: info-recursive info-am: -install-data-am: install-includeHEADERS +install-data-am: install-dvi: install-dvi-recursive @@ -781,7 +739,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-includeHEADERS +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ ctags-recursive install-am install-strip tags-recursive @@ -794,14 +752,12 @@ uninstall-am: uninstall-includeHEADERS distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-includeHEADERS + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am licences: @@ -812,14 +768,14 @@ 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: for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ @FILE@ @ICONV@ @SQLITE@; \ do \ - (cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) clean); \ + $(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \ done; $(top_builddir)/tools/@NCURSES@/lib/libncurses.a: @@ -847,11 +803,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; @@ -865,21 +821,64 @@ $(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; - (cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS)) + if [ @OS@ = "OS2" ]; then \ + TMP=$$(mktemp tmp.XXXXXXXXXX); \ + awk \ + '/^CXX_AR[ \t]/ \ + { printf("CXX_AR = $(AR)\n"); } \ + ! /^CXX_AR[ \t]/ \ + { print; }' \ + $(top_builddir)/tools/@NCURSES@/c++/Makefile | \ + awk \ + '/^CXX_ARFLAGS[ \t]/ \ + { printf("CXX_ARFLAGS = $(ARFLAGS)\n"); } \ + ! /^CXX_ARFLAGS[ \t]/ \ + { print; }' | \ + awk \ + '/^CXX[ \t]/ \ + { printf("CXX = g++\n"); } \ + ! /^CXX[ \t]/ \ + { print; }' > $$TMP; \ + 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: - (cd $(top_builddir)/tools/@READLINE@ && $(MAKE) $(AM_MAKEFLAGS)) + $(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS) $(top_builddir)/tools/@GSL@/.libs/libgsl.a: - (cd $(top_builddir)/tools/@GSL@ && $(MAKE) $(AM_MAKEFLAGS)) +# 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: # La dépendance est faite par rpliconv. - (cd $(top_builddir)/tools/@ICONV@ && $(MAKE) $(AM_MAKEFLAGS)) + if [ @OS@ = "OS2" ]; then \ + TMP=$$(mktemp tmp.XXXXXXXXXX); \ + 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 $(top_builddir)/lapack/lapack/liblapack.a: (cd $(top_builddir)/lapack/lapack && $(MAKE) $(AM_MAKEFLAGS)) @@ -889,9 +888,12 @@ $(top_builddir)/lapack/blas/libblas.a: $(top_builddir)/rpliconv/rpliconv$(EXEEXT): \ $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a - (cd $(top_builddir)/rpliconv && $(MAKE) $(AM_MAKEFLAGS)) + $(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 \ +$(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); \ @@ -913,26 +915,47 @@ $(top_builddir)/tools/@FILE@/src/rplfile print; \ } \ }' tools/@FILE@/src/Makefile > $$TMP; \ - \mv -f $$TMP tools/@FILE@/src/Makefile - (cd $(top_builddir)/tools/@FILE@ && $(MAKE) $(AM_MAKEFLAGS)) + mv -f $$TMP tools/@FILE@/src/Makefile + $(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS) + $(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + $(top_builddir)/tools/@FILE@/src/*.o \ + $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \ + cut -d= -f2) $(LDFLAGS) $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a: - (cd $(top_builddir)/tools/@SQLITE@ && $(MAKE) $(AM_MAKEFLAGS)) + $(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: - (cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) $(AM_MAKEFLAGS)) - -$(top_builddir)/ptmalloc3/libptmalloc3.a : - (cd $(top_builddir)/ptmalloc3 && $(MAKE) $(AM_MAKEFLAGS)) + if [ @OS@ = "OS2" ]; then \ + (cd $(top_builddir)/tools/@OPENSSL@ && \ + sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \ + OS2-EMX.mak | \ + sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \ + sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \ + sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \ + 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 - (cd $(top_builddir)/rplsums && $(MAKE) $(AM_MAKEFLAGS)) + $(MAKE) -C $(top_builddir)/rplsums $(AM_MAKEFLAGS) $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT): - (cd $(top_builddir)/tools/@GPP@ && $(MAKE) $(AM_MAKEFLAGS)) + $(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS) .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ $(top_builddir)/tools/@FILE@/magic/magic.mgc @@ -958,17 +981,17 @@ 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$(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 \ $(top_builddir)/tools/rplsums/rplsha1sum \ $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) # Cette règle n'est là que pour forcer la compilation de Gnuplot. - (cd $(top_builddir)/tools && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(top_builddir)/rpltags && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS)) + $(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS) + $(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS) + $(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS) # 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.