[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.24

version 1.22, 2010/08/13 21:02:37 version 1.24, 2010/09/13 11:59:11
Line 7  subdirs = @NCURSES@ @READLINE@ @UNITS@ @ Line 7  subdirs = @NCURSES@ @READLINE@ @UNITS@ @
   
 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 19  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 29  all: Line 35  all:
             (cd @OPENSSL@ && $(MAKE) test && touch tests_success); \              (cd @OPENSSL@ && $(MAKE) 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.24

CVSweb interface <joel.bertrand@systella.fr>