rpl/tools/Makefile.am - diff

Return to Makefile.am CVS log

Up to [local] / rpl / tools

Diff for /rpl/tools/Makefile.am between versions 1.56 and 1.87

-version 1.56, 2011/11/28 20:28:55
+version 1.87, 2013/03/10 22:26:21
  Line 2  EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
          @GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
          @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
          @OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \
-         @NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \
+         @NCURSES@-20120616.sh.gz \
-         @NCURSES@-20110423.patch.gz @NCURSES@-20110430.patch.gz \
+         @NCURSES@-20120622.patch.gz @NCURSES@-20120630.patch.gz \
-         @NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \
+         @NCURSES@-20120707.patch.gz @NCURSES@-20120714.patch.gz \
-         @NCURSES@-20110521.patch.gz @NCURSES@-20110528.patch.gz \
+         @NCURSES@-20120721.patch.gz @NCURSES@-20120728.patch.gz \
-         @NCURSES@-20110604.patch.gz @NCURSES@-20110611.patch.gz \
+         @NCURSES@-20120804.patch.gz @NCURSES@-20120811.patch.gz \
-         @NCURSES@-20110625.patch.gz @NCURSES@-20110626.patch.gz \
+         @NCURSES@-20120825.patch.gz @NCURSES@-20120826.patch.gz \
-         @NCURSES@-20110702.patch.gz @NCURSES@-20110716.patch.gz \
+         @NCURSES@-20120901.patch.gz @NCURSES@-20120902.patch.gz \
-         @NCURSES@-20110723.patch.gz @NCURSES@-20110730.patch.gz \
+         @NCURSES@-20120903.patch.gz @NCURSES@-20120908.patch.gz \
-         @NCURSES@-20110807.patch.gz @NCURSES@-20110813.patch.gz \
+         @NCURSES@-20120922.patch.gz @NCURSES@-20121006.patch.gz \
-         @NCURSES@-20110820.patch.gz @NCURSES@-20110903.patch.gz \
+         @NCURSES@-20121013.patch.gz @NCURSES@-20121017.patch.gz \
-         @NCURSES@-20110910.patch.gz @NCURSES@-20110917.patch.gz \
+         @NCURSES@-20121026.patch.gz @NCURSES@-20121102.patch.gz \
-         @NCURSES@-20110924.patch.gz @NCURSES@-20110925.patch.gz \
+         @NCURSES@-20121110.patch.gz @NCURSES@-20121117.patch.gz \
-         @NCURSES@-20111001.patch.gz @NCURSES@-20111008.patch.gz \
+         @NCURSES@-20121124.patch.gz @NCURSES@-20121201.patch.gz \
-         @NCURSES@-20111015.patch.gz @NCURSES@-20111022.patch.gz \
+         @NCURSES@-20121208.patch.gz @NCURSES@-20121215.patch.gz \
-         @NCURSES@-20111030.patch.gz @NCURSES@-20111112.patch.gz \
+         @NCURSES@-20121222.patch.gz @NCURSES@-20121229.patch.gz \
-         @NCURSES@-20111119.patch.gz @NCURSES@-20111126.patch.gz \
+         @NCURSES@-20130105.patch.gz @NCURSES@-20130112.patch.gz \
-         openmotif.lib
+         @NCURSES@-20130119.patch.gz @NCURSES@-20130126.patch.gz \
+         @NCURSES@-20130202.patch.gz @NCURSES@-20130209.patch.gz \
+         @NCURSES@-20130216.patch.gz @NCURSES@-20130218.patch.gz \
+         @NCURSES@-20130302.patch.gz @NCURSES@-20130309.patch.gz
  subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
          @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
  all:
-     TMP=tmp.tools; \
-     sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \
-             sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \
-     mv -f $$TMP @UNITS@/Makefile
-     @list='$(subdirs)'; for subdir in $$list; do \
-         echo "Making $@ in $$subdir"; \
-         if [ $$subdir = @OPENSSL@ ]; then \
-             if [ @OS@ = "OS2" ]; then \
-                 $(MAKE) -C $$subdir -j1 -f OS2-EMX.mak2; \
-             else \
-                 $(MAKE) -C $$subdir -j1 $@; \
-             fi; \
-         else \
-             if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
-                 TMP=tmp.units; \
-                 sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
-                         @UNITS@/Makefile > $$TMP; \
-                 mv -f $$TMP @UNITS@/Makefile; \
-             fi; \
-             $(MAKE) -C $$subdir $@; \
-         fi; \
-     done;
-     if [ ! -f @OPENSSL@/tests_success ]; then \
-         if [ @OS@ = "OS2" -o @RPLTOOLS@ != '\$(top_builddir)' ]; then \
-             (cd @OPENSSL@ && touch tests_success); \
-         else \
-             (cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
-         fi; \
-     fi
      touch openmotif.lib && rm openmotif.lib;
      if [ x"@BUILD_OPENMOTIF@" = x ]; then \
          touch openmotif.lib; \
- Line 62  all:
+ Line 36  all:
          echo -n LD_MOTIF_ >> openmotif.lib; \
          grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
      fi
+     if [ @GNUPLOT_COMPILATION@ ]; then \
+             $(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
  clean distclean:
      @list='$(subdirs)'; for subdir in $$list; do \
- Line 82  install: all
+ Line 58  install: all
      $(INSTALL_PROGRAM) $(UNITS)/units$(EXEEXT) \
              $(DESTDIR)$(bindir)/rplconvert$(EXEEXT)
      $(mkinstalldirs) $(DESTDIR)$(datadir)
-     $(INSTALL_DATA) $(srcdir)/$(UNITS)/units.dat $(DESTDIR)$(datadir)/rplunits
+     $(INSTALL_DATA) $(srcdir)/$(UNITS)/definitions.units \
+             $(DESTDIR)$(datadir)/rplunits.tmp
+     sed 's/^!include currency.units//g' $(DESTDIR)$(datadir)/rplunits.tmp \
+             > $(DESTDIR)$(datadir)/rplunits
+     rm -f $(DESTDIR)$(datadir)/rplunits.tmp
      $(INSTALL_PROGRAM) $(GPP)/src/gpp$(EXEEXT) \
              $(DESTDIR)$(bindir)/rplpp$(EXEEXT)
      $(mkinstalldirs) $(DESTDIR)$(mandir)/man1

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.56
changed lines
	Added in v.1.87