[BACK]Return to Makefile.am CVS log [TXT] [DIR] Up to [local] / rpl

Diff for /rpl/Makefile.am between versions 1.31 and 1.32

version 1.31, 2011/10/05 13:14:17 version 1.32, 2011/10/10 10:58:10
Line 29  toolsclean: Line 29  toolsclean:
         $(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \          $(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \
     done;      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 \      for i in $(shell find tools/@NCURSES@ -name Makefile \
          -exec grep static {} /dev/null \; | cut -d: -f1); \           -exec grep static {} /dev/null \; | cut -d: -f1); \
     do \      do \
Line 68  $(top_builddir)/tools/@NCURSES@/lib/libn Line 68  $(top_builddir)/tools/@NCURSES@/lib/libn
         TMP=tmp.ncurses_test; \          TMP=tmp.ncurses_test; \
         awk \          awk \
             '/^TEST_ARGS/ \              '/^TEST_ARGS/ \
                 { printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \                  { printf("TEST_ARGS = ../lib/@LIB_PREFIX@form.a \
                 printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \                          ../lib/@LIB_PREFIX@menu.a "); \
                   printf("../lib/@LIB_PREFIX@panel.a \
                           ../lib/@LIB_PREFIX@ncurses.a\n"); } \
             ! /^TEST_ARGS/ \              ! /^TEST_ARGS/ \
                 { print; }' tools/@NCURSES@/test/Makefile > $$TMP; \                  { print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
         mv -f $$TMP $$i; \          mv -f $$TMP $$i; \
Line 96  $(top_builddir)/tools/@NCURSES@/lib/libn Line 98  $(top_builddir)/tools/@NCURSES@/lib/libn
         mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \          mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \
     fi;      fi;
     $(MAKE) -C $(top_builddir)/tools/@NCURSES@ $(AM_MAKEFLAGS)      $(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@/@LIB_PREFIX@readline.a \
         $(top_builddir)/tools/@READLINE@/libhistory.a:          $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a:
     $(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)      $(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 + "$@"}  # Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"}
 # dans ltmain.sh et propager les modifications dans le script libtool.  # dans ltmain.sh et propager les modifications dans le script libtool.
     if [ @OS@ = "OS2" ]; then \      if [ @OS@ = "OS2" ]; then \
         (cd $(top_builddir)/tools/@GSL@ && configure --disable-shared;); \          (cd $(top_builddir)/tools/@GSL@ && configure --disable-shared;); \
     fi      fi
     $(MAKE) -C $(top_builddir)/tools/@GSL@ $(AM_MAKEFLAGS)      $(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.  # La dépendance est faite par rpliconv.
     if [ @OS@ = "OS2" ]; then \      if [ @OS@ = "OS2" ]; then \
         TMP=tmp.libiconv; \          TMP=tmp.libiconv; \
Line 125  $(top_builddir)/tools/@ICONV@/lib/.libs/ Line 119  $(top_builddir)/tools/@ICONV@/lib/.libs/
                 $(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \                  $(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; \          $(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 \      else \
         $(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \          $(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
     fi      fi
Line 138  $(top_builddir)/lapack/blas/libblas.a: Line 130  $(top_builddir)/lapack/blas/libblas.a:
     (cd $(top_builddir)/lapack/blas && $(MAKE) $(AM_MAKEFLAGS))      (cd $(top_builddir)/lapack/blas && $(MAKE) $(AM_MAKEFLAGS))
   
 $(top_builddir)/rpliconv/rpliconv$(EXEEXT): \  $(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)      $(MAKE) -C $(top_builddir)/rpliconv $(AM_MAKEFLAGS)
   
 $(top_builddir)/rplawk/rplawk$(EXEEXT):  $(top_builddir)/rplawk/rplawk$(EXEEXT):
Line 146  $(top_builddir)/rplawk/rplawk$(EXEEXT): Line 138  $(top_builddir)/rplawk/rplawk$(EXEEXT):
   
 $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
         $(top_builddir)/tools/@FILE@/magic/magic.mgc: \          $(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; \      TMP=tmp.rplfile; \
     awk \      awk \
     '{ \      '{ \
Line 173  $(top_builddir)/tools/@FILE@/src/rplfile Line 165  $(top_builddir)/tools/@FILE@/src/rplfile
             $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \              $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
             cut -d= -f2) $(LDFLAGS)              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)      $(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@/@LIB_PREFIX@crypto.a \
         $(top_builddir)/tools/@OPENSSL@/libssl.a:          $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a:
     if [ @OS@ = "OS2" ]; then \      if [ @OS@ = "OS2" ]; then \
         (cd $(top_builddir)/tools/@OPENSSL@ && \          (cd $(top_builddir)/tools/@OPENSSL@ && \
                 sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \                  sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
Line 192  $(top_builddir)/tools/@OPENSSL@/libcrypt Line 180  $(top_builddir)/tools/@OPENSSL@/libcrypt
                 sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \                  sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
                 > OS2-EMX.mak2; \                  > OS2-EMX.mak2; \
                 $(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \                  $(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 \      else \
         (cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \          (cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \
     fi      fi
   
 $(top_builddir)/tools/rplsums/rplmd5sum \  $(top_builddir)/tools/rplsums/rplmd5sum \
         $(top_builddir)/tools/rplsums/rplsha1sum: \          $(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)      $(MAKE) -C $(top_builddir)/rplsums $(AM_MAKEFLAGS)
   
 $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT):  $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT):
Line 211  $(top_builddir)/tools/@GPP@/src/gpp$(EXE Line 195  $(top_builddir)/tools/@GPP@/src/gpp$(EXE
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
         $(top_builddir)/tools/@FILE@/magic/magic.mgc          $(top_builddir)/tools/@FILE@/magic/magic.mgc
   
 .NOTPARALLEL: $(top_builddir)/tools/@READLINE@/libreadline.a \  .NOTPARALLEL: $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \
         $(top_builddir)/tools/@READLINE@/libhistory.a          $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a
   
 .NOTPARALLEL: $(top_builddir)/tools/@OPENSSL@/libcrypto.a \  .NOTPARALLEL: $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
         $(top_builddir)/tools/@OPENSSL@/libssl.a          $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a
   
 .NOTPARALLEL: $(top_builddir)/tools/rplsums/rplmd5sum \  .NOTPARALLEL: $(top_builddir)/tools/rplsums/rplmd5sum \
         $(top_builddir)/tools/rplsums/rplsha1sum          $(top_builddir)/tools/rplsums/rplsha1sum
Line 224  install-strip: Line 208  install-strip:
     $(MAKE) $(AM_MAKEFLAGS) install      $(MAKE) $(AM_MAKEFLAGS) install
   
 $(top_builddir)/rplcas/lib/librplcas.a: \  $(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)      $(MAKE) -C $(top_builddir)/rplcas $(AM_MAKEFLAGS)
   
 all: $(top_builddir)/tools/@NCURSES@/lib/libncurses.a \  all: $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a \
         $(top_builddir)/tools/@READLINE@/libreadline.a \          $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \
         $(top_builddir)/tools/@READLINE@/libhistory.a \          $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a \
         $(top_builddir)/tools/@GSL@/.libs/libgsl.a \          $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a \
         $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a \          $(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a \
         $(top_builddir)/tools/@OPENSSL@/libcrypto.a \          $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
         $(top_builddir)/tools/@OPENSSL@/libssl.a \          $(top_builddir)/tools/@OPENSSL@/libssl.a \
         $(top_builddir)/lapack/lapack/liblapack.a \          $(top_builddir)/lapack/lapack/liblapack.a \
         $(top_builddir)/lapack/blas/libblas.a \          $(top_builddir)/lapack/blas/libblas.a \
Removed from v.1.31  
changed lines
  Added in v.1.32

CVSweb interface <joel.bertrand@systella.fr>