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

Diff for /rpl/tools/Makefile.am between versions 1.22 and 1.38

version 1.22, 2010/08/13 21:02:37 version 1.38, 2011/06/09 08:49:48
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 @SQLITE@.diff.gz @OPENSSL@.tar.gz          @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
           @NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \
           @NCURSES@-20110423.patch.gz @NCURSES@-20110430.patch.gz \
           @NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \
           @NCURSES@-20110521.patch.gz @NCURSES@-20110528.patch.gz
   
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \  subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
         @FILE@ @ICONV@ @SQLITE@ @OPENSSL@          @FILE@ @ICONV@ @SQLITE@ @OPENSSL@
   
 all:  all:
     TMP=$$(mktemp tmp.XXXXXXXXXX); \      TMP=$$(mktemp tmp.XXXXXXXXXX); \
     sed s/DREADLINE/UREADLINE/g @UNITS@/Makefile | \      sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \
             sed s/-lreadline//g | sed s/-lncurses//g > $$TMP; \              sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \
     mv -f $$TMP @UNITS@/Makefile      mv -f $$TMP @UNITS@/Makefile
     @list='$(subdirs)'; for subdir in $$list; do \      @list='$(subdirs)'; for subdir in $$list; do \
         echo "Making $@ in $$subdir"; \          echo "Making $@ in $$subdir"; \
Line 19  all: Line 23  all:
                 $(MAKE) -C $$subdir -j1 $@; \                  $(MAKE) -C $$subdir -j1 $@; \
             fi; \              fi; \
         else \          else \
               if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
                   TMP=$$(mktemp tmp.XXXXXXXXXX); \
                   sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
                           @UNITS@/Makefile > $$TMP; \
                   mv -f $$TMP @UNITS@/Makefile; \
               fi; \
             $(MAKE) -C $$subdir $@; \              $(MAKE) -C $$subdir $@; \
         fi; \          fi; \
     done;      done;
Line 26  all: Line 36  all:
         if [ @OS@ = "OS2" ]; then \          if [ @OS@ = "OS2" ]; then \
             (cd @OPENSSL@ && touch tests_success); \              (cd @OPENSSL@ && touch tests_success); \
         else \          else \
             (cd @OPENSSL@ && $(MAKE) test && touch tests_success); \              (cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
         fi; \          fi; \
     fi      fi
     $(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  
             $(top_builddir)/tools/@FILE@/src/*.o \  
             $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \  
             cut -d= -f2) $(LDFLAGS)  
   
 clean distclean:  clean distclean:
     @list='$(subdirs)'; for subdir in $$list; do \      @list='$(subdirs)'; for subdir in $$list; do \
Removed from v.1.22  
changed lines
  Added in v.1.38

CVSweb interface <joel.bertrand@systella.fr>