Diff for /rpl/Attic/Makefile.in between versions 1.11 and 1.12

version 1.11, 2010/04/07 07:16:10 version 1.12, 2010/04/17 18:57:33
Line 155  ECHO_T = @ECHO_T@ Line 155  ECHO_T = @ECHO_T@
 EGREP = @EGREP@  EGREP = @EGREP@
 EXEEXT = @EXEEXT@  EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@  EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
   EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
 F77 = @F77@  F77 = @F77@
 FC = @FC@  FC = @FC@
 FCFLAGS = @FCFLAGS@  FCFLAGS = @FCFLAGS@
Line 182  LDFLAGS = @LDFLAGS@ Line 183  LDFLAGS = @LDFLAGS@
 LIBMTMALLOC = @LIBMTMALLOC@  LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@  LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@  LIBS = @LIBS@
 LIBTOOLIZE = @LIBTOOLIZE@  
 LN_S = @LN_S@  LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@  LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@  MAKEINFO = @MAKEINFO@
Line 190  MKDIR_P = @MKDIR_P@ Line 190  MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@  MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@  MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@  NCURSES = @NCURSES@
   NESTED_FUNCTIONS = @NESTED_FUNCTIONS@
 OBJEXT = @OBJEXT@  OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@  OPENSSL = @OPENSSL@
 OS = @OS@  OS = @OS@
Line 208  RANLIB = @RANLIB@ Line 209  RANLIB = @RANLIB@
 READLINE = @READLINE@  READLINE = @READLINE@
 RUNPATH = @RUNPATH@  RUNPATH = @RUNPATH@
 SED = @SED@  SED = @SED@
   SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
 SET_MAKE = @SET_MAKE@  SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@  SHELL = @SHELL@
 SQLITE = @SQLITE@  SQLITE = @SQLITE@
Line 825  toolsclean: Line 827  toolsclean:
         (cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) clean); \          (cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) clean); \
     done;      done;
   
 tools:  $(top_builddir)/tools/@NCURSES@/lib/libncurses.a:
     for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \      for i in $(shell find tools/@NCURSES@ -name Makefile \
             @FILE@ @ICONV@ @SQLITE@; \           -exec grep static {} /dev/null \; | cut -d: -f1); \
     do \      do \
         (cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) all); \          echo -n Checking $$i; \
           TMP=$$(mktemp tmp.XXXXXXXXXX); \
           if [ -n "$$(grep static $$i | grep dynamic)" ]; then \
               awk \
               '{ \
                   if (index($$0, "-static") != 0 && index($$0, "-dynamic") != 0) \
                   { \
                       for(j = 1; j <= NF; j++) \
                       { \
                           if (index($$j, "-static") == 0) \
                           { \
                               printf("%s ", $$j); \
                           } \
                       } \
                       printf("\n"); \
                   } \
                   else \
                   { \
                       print; \
                   } \
               }' $$i > $$TMP; \
               \mv -f $$TMP $$i; \
               echo -n " (fixed)"; \
           else \
               echo -n " (nothing to do)"; \
               \rm -f $$TMP; \
           fi; \
           echo .; \
     done;      done;
   
 $(top_builddir)/tools/@NCURSES@/lib/libncurses.a:  
     (cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS))      (cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS))
   
 $(top_builddir)/tools/@READLINE@/libreadline.a \  $(top_builddir)/tools/@READLINE@/libreadline.a \
Line 845  $(top_builddir)/tools/@GSL@/.libs/libgsl Line 872  $(top_builddir)/tools/@GSL@/.libs/libgsl
 $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a:  $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a:
 # La dépendance est faite par rpliconv.  # La dépendance est faite par rpliconv.
     (cd $(top_builddir)/tools/@ICONV@ && $(MAKE) $(AM_MAKEFLAGS))      (cd $(top_builddir)/tools/@ICONV@ && $(MAKE) $(AM_MAKEFLAGS))
     $(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \  
             $(top_builddir)/tools/@ICONV@/lib/.libs/*.o  
     $(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a  
   
 $(top_builddir)/lapack/lapack/liblapack.a:  $(top_builddir)/lapack/lapack/liblapack.a:
     (cd $(top_builddir)/lapack/lapack && $(MAKE) $(AM_MAKEFLAGS))      (cd $(top_builddir)/lapack/lapack && $(MAKE) $(AM_MAKEFLAGS))
Line 862  $(top_builddir)/rpliconv/rpliconv: \ Line 886  $(top_builddir)/rpliconv/rpliconv: \
 $(top_builddir)/tools/@FILE@/src/rplfile \  $(top_builddir)/tools/@FILE@/src/rplfile \
         $(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/libiconv.a
       TMP=$$(mktemp tmp.XXXXXXXXXX); \
       awk \
       '{ \
           if (index($$0, "LDFLAGS") == 1) \
           { \
               if (index($$0, "-static") == 0) \
               { \
                   printf("%s -static\n", $$0); \
               } \
               else \
               { \
                   print; \
               } \
           } \
           else \
           { \
               print; \
           } \
       }' tools/@FILE@/src/Makefile > $$TMP; \
       \mv -f $$TMP tools/@FILE@/src/Makefile
     (cd $(top_builddir)/tools/@FILE@ && $(MAKE) $(AM_MAKEFLAGS))      (cd $(top_builddir)/tools/@FILE@ && $(MAKE) $(AM_MAKEFLAGS))
   
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:  $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:

Removed from v.1.11  
changed lines
  Added in v.1.12


CVSweb interface <joel.bertrand@systella.fr>