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

Diff for /rpl/Makefile.am between versions 1.46 and 1.47

version 1.46, 2012/05/14 11:49:59 version 1.47, 2012/05/14 19:30:02
Line 177  $(top_builddir)/tools/@SQLITE@/.libs/@LI Line 177  $(top_builddir)/tools/@SQLITE@/.libs/@LI
   
 $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \  $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
         $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a:          $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a:
     if [ @OS@ = "OS2" ]; then \      if [ ! -f $(top_builddir)/tools/@OPENSSL@/tests_success ]; then \
         (cd $(top_builddir)/tools/@OPENSSL@ && \          if [ @OS@ = "OS2" ]; then \
                 sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \              (cd $(top_builddir)/tools/@OPENSSL@ && \
                 OS2-EMX.mak | \                      sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
                 sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \                      OS2-EMX.mak | \
                 sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \                      sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \
                 sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \                      sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \
                 sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \                      sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \
                 > OS2-EMX.mak2; \                      sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
                 $(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \                      > OS2-EMX.mak2; \
     else \                      $(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS); \
         (cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \                      touch tests_success); \
           else \
               (cd $(top_builddir)/tools/@OPENSSL@ && \
                       $(MAKE) -j1 $(AM_MAKEFLAGS); \
                       touch tests_success); \
           fi \
     fi      fi
   
 $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \  $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
Line 200  $(top_builddir)/tools/@GPP@/src/gpp$(EXE Line 205  $(top_builddir)/tools/@GPP@/src/gpp$(EXE
     $(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)      $(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)
   
 $(top_builddir)/tools/@UNITS@/units$(EXEEXT):  $(top_builddir)/tools/@UNITS@/units$(EXEEXT):
       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 $(top_builddir)/tools/@UNITS@ $(AM_MAKEFLAGS)      $(MAKE) -C $(top_builddir)/tools/@UNITS@ $(AM_MAKEFLAGS)
   
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \  .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
Removed from v.1.46  
changed lines
  Added in v.1.47

CVSweb interface <joel.bertrand@systella.fr>