Diff for /rpl/tools/Makefile.am between versions 1.60 and 1.153

version 1.60, 2012/03/15 14:10:35 version 1.153, 2018/02/09 09:41:04
Line 1 Line 1
 EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \  EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \
         @GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \          @GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
         @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \          @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
         @OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \          @OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz @ZLIB@.tar.gz \
         @NCURSES@-20111224.sh.gz \          @NCURSES@-20150613.patch.gz @NCURSES@-20150627.patch.gz \
         @NCURSES@-20111231.patch.gz @NCURSES@-20120107.patch.gz \          @NCURSES@-20150704.patch.gz @NCURSES@-20150711.patch.gz \
         @NCURSES@-20120114.patch.gz @NCURSES@-20120121.patch.gz \          @NCURSES@-20150719.patch.gz @NCURSES@-20150725.patch.gz \
         @NCURSES@-20120128.patch.gz @NCURSES@-20120204.patch.gz \          @NCURSES@-20150808.patch.gz @NCURSES@-20150810.patch.gz \
         @NCURSES@-20120211.patch.gz @NCURSES@-20120218.patch.gz \          @NCURSES@-20150815.patch.gz @NCURSES@-20150822.patch.gz \
         @NCURSES@-20120225.patch.gz @NCURSES@-20120228.patch.gz \          @NCURSES@-20150905.patch.gz @NCURSES@-20150912.patch.gz \
         @NCURSES@-20120303.patch.gz @NCURSES@-20120310.patch.gz \          @NCURSES@-20150919.patch.gz @NCURSES@-20150926.patch.gz \
         openmotif.lib          @NCURSES@-20151010.patch.gz @NCURSES@-20151017.patch.gz \
           @NCURSES@-20151024.patch.gz @NCURSES@-20151101.patch.gz \
           @NCURSES@-20151107.patch.gz @NCURSES@-20151121.patch.gz \
           @NCURSES@-20151128.patch.gz @NCURSES@-20151205.patch.gz \
           @NCURSES@-20151212.patch.gz @NCURSES@-20151219.patch.gz \
           @NCURSES@-20151226.patch.gz @NCURSES@-20160102.patch.gz \
           @NCURSES@-20160116.patch.gz @NCURSES@-20160123.patch.gz \
           @NCURSES@-20160130.patch.gz @NCURSES@-20160206.patch.gz \
           @NCURSES@-20160213.patch.gz @NCURSES@-20160220.patch.gz \
           @NCURSES@-20160305.patch.gz @NCURSES@-20160312.patch.gz \
           @NCURSES@-20160319.patch.gz @NCURSES@-20160326.patch.gz \
           @NCURSES@-20160402.patch.gz @NCURSES@-20160409.patch.gz \
           @NCURSES@-20160416.patch.gz @NCURSES@-20160423.patch.gz \
           @NCURSES@-20160507.patch.gz @NCURSES@-20160514.patch.gz \
           @NCURSES@-20160521.patch.gz @NCURSES@-20160528.patch.gz \
           @NCURSES@-20160604.patch.gz @NCURSES@-20160611.patch.gz \
           @NCURSES@-20160618.patch.gz @NCURSES@-20160625.patch.gz \
           @NCURSES@-20160702.patch.gz @NCURSES@-20160709.patch.gz \
           @NCURSES@-20160723.patch.gz @NCURSES@-20160730.patch.gz \
           @NCURSES@-20160806.patch.gz @NCURSES@-20160813.patch.gz \
           @NCURSES@-20160820.patch.gz @NCURSES@-20160827.patch.gz \
           @NCURSES@-20160903.patch.gz @NCURSES@-20160910.patch.gz \
           @NCURSES@-20160917.patch.gz @NCURSES@-20160924.patch.gz \
           @NCURSES@-20161001.patch.gz @NCURSES@-20161008.patch.gz \
           @NCURSES@-20161015.patch.gz @NCURSES@-20161022.patch.gz \
           @NCURSES@-20161029.patch.gz @NCURSES@-20161105.patch.gz \
           @NCURSES@-20161112.patch.gz @NCURSES@-20161119.patch.gz \
           @NCURSES@-20161126.patch.gz @NCURSES@-20161203.patch.gz \
           @NCURSES@-20161210.patch.gz @NCURSES@-20161217.patch.gz \
           @NCURSES@-20161224.patch.gz @NCURSES@-20161231.patch.gz \
           @NCURSES@-20170107.patch.gz @NCURSES@-20170114.patch.gz \
           @NCURSES@-20170121.patch.gz @NCURSES@-20170128.patch.gz \
           @NCURSES@-20170204.patch.gz @NCURSES@-20170212.patch.gz \
           @NCURSES@-20170218.patch.gz @NCURSES@-20170225.patch.gz \
           @NCURSES@-20170304.patch.gz @NCURSES@-20170311.patch.gz \
           @NCURSES@-20170318.patch.gz @NCURSES@-20170325.patch.gz \
           @NCURSES@-20170401.patch.gz @NCURSES@-20170408.patch.gz \
           @NCURSES@-20170415.patch.gz @NCURSES@-20170422.patch.gz \
           @NCURSES@-20170429.patch.gz @NCURSES@-20170506.patch.gz \
           @NCURSES@-20170513.patch.gz @NCURSES@-20170520.patch.gz \
           @NCURSES@-20170527.patch.gz @NCURSES@-20170603.patch.gz \
           @NCURSES@-20170610.patch.gz @NCURSES@-20170617.patch.gz \
           @NCURSES@-20170624.patch.gz @NCURSES@-20170701.patch.gz \
           @NCURSES@-20170708.patch.gz @NCURSES@-20170715.patch.gz \
           @NCURSES@-20170722.patch.gz @NCURSES@-20170729.patch.gz \
           @NCURSES@-20170812.patch.gz @NCURSES@-20170819.patch.gz \
           @NCURSES@-20170826.patch.gz @NCURSES@-20170827.patch.gz \
           @NCURSES@-20170902.patch.gz @NCURSES@-20170909.patch.gz \
           @NCURSES@-20170916.patch.gz @NCURSES@-20170923.patch.gz \
           @NCURSES@-20170930.patch.gz @NCURSES@-20171007.patch.gz \
           @NCURSES@-20171014.patch.gz @NCURSES@-20171021.patch.gz \
           @NCURSES@-20171028.patch.gz @NCURSES@-20171104.patch.gz \
           @NCURSES@-20171111.patch.gz @NCURSES@-20171118.patch.gz \
           @NCURSES@-20171125.patch.gz @NCURSES@-20171209.patch.gz \
           @NCURSES@-20171216.patch.gz @NCURSES@-20171223.patch.gz \
           @NCURSES@-20171230.patch.gz @NCURSES@-20180106.patch.gz \
           @NCURSES@-20180120.patch.gz @NCURSES@-20180121.patch.gz \
           ncurses-6.1-20180127.patch.gz ncurses-6.1-20180129.patch.gz
   
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \  subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
         @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@          @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @BUILD_SIGSEGV@ @BUILD_OPENMOTIF@ \
           @ZLIB@
   
 all:  all:
     TMP=tmp.tools; \      test -f openmotif.lib && rm -f openmotif.lib;
     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 \      if [ x"@BUILD_OPENMOTIF@" = x ]; then \
         touch openmotif.lib; \          touch openmotif.lib; \
     else \      else \
         echo -n LD_MOTIF_ > openmotif.lib; \          echo -n LD_MOTIF_ > openmotif.lib; \
         grep "^LIBS=" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \          grep "^LIBS=" @OPENMOTIF@/config.log | \
                   tr -d "'" >> openmotif.lib; \
         echo -n LD_MOTIF_ >> openmotif.lib; \          echo -n LD_MOTIF_ >> openmotif.lib; \
         grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \          grep "^X_XMU" @OPENMOTIF@/config.log | \
                   tr -d "'" >> openmotif.lib; \
     fi      fi
       if [ x"@GNUPLOT_COMPILATION@" != x ]; then \
               $(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
   
 clean distclean:  clean distclean:
     @list='$(subdirs)'; for subdir in $$list; do \      @list='$(subdirs)'; for subdir in $$list; do \
Line 61  clean distclean: Line 94  clean distclean:
             $(MAKE) -C $$subdir $@; \              $(MAKE) -C $$subdir $@; \
         fi; \          fi; \
     done;      done;
       if [ -d @OPENMOTIF@/install ]; then \
           rm -rf @OPENMOTIF@/install; \
       fi
     if [ -f @OPENSSL@/tests_success ]; then \      if [ -f @OPENSSL@/tests_success ]; then \
         rm -f @OPENSSL@/tests_success; \          rm -f @OPENSSL@/tests_success; \
     fi      fi
Line 73  install: all Line 109  install: all
     $(INSTALL_PROGRAM) $(UNITS)/units$(EXEEXT) \      $(INSTALL_PROGRAM) $(UNITS)/units$(EXEEXT) \
             $(DESTDIR)$(bindir)/rplconvert$(EXEEXT)              $(DESTDIR)$(bindir)/rplconvert$(EXEEXT)
     $(mkinstalldirs) $(DESTDIR)$(datadir)      $(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) \      $(INSTALL_PROGRAM) $(GPP)/src/gpp$(EXEEXT) \
             $(DESTDIR)$(bindir)/rplpp$(EXEEXT)              $(DESTDIR)$(bindir)/rplpp$(EXEEXT)
     $(mkinstalldirs) $(DESTDIR)$(mandir)/man1      $(mkinstalldirs) $(DESTDIR)$(mandir)/man1

Removed from v.1.60  
changed lines
  Added in v.1.153


CVSweb interface <joel.bertrand@systella.fr>