rpl/Makefile.am - diff

Return to Makefile.am CVS log

Up to [local] / rpl

Diff for /rpl/Makefile.am between versions 1.6 and 1.7

-version 1.6, 2010/03/17 14:14:35
+version 1.7, 2010/04/17 18:57:33
  Line 27  toolsclean:
          (cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) clean); \
      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 \
-         (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;
- $(top_builddir)/tools/@NCURSES@/lib/libncurses.a:
      (cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS))
  $(top_builddir)/tools/@READLINE@/libreadline.a \
- Line 47  $(top_builddir)/tools/@GSL@/.libs/libgsl
+ Line 72  $(top_builddir)/tools/@GSL@/.libs/libgsl
  $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a:
  # La dépendance est faite par rpliconv.
      (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:
      (cd $(top_builddir)/lapack/lapack && $(MAKE) $(AM_MAKEFLAGS))
- Line 64  $(top_builddir)/rpliconv/rpliconv: \
+ Line 86  $(top_builddir)/rpliconv/rpliconv: \
  $(top_builddir)/tools/@FILE@/src/rplfile \
          $(top_builddir)/tools/@FILE@/magic/magic.mgc: \
          $(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))
  $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.6
changed lines
	Added in v.1.7