[BACK]Return to Makefile CVS log [TXT][DIR] Up to [local] / src

Diff for /src/Makefile between version 1.79 and 1.86

version 1.79, 2001/09/17 01:18:34 version 1.86, 2002/08/11 22:48:05
Line 4 
Line 4 
 # For more information on building in tricky environments, please see  # For more information on building in tricky environments, please see
 # the list of possible environment variables described in  # the list of possible environment variables described in
 # /usr/share/mk/bsd.README.  # /usr/share/mk/bsd.README.
 #  #
 # Building recommendations:  # Building recommendations:
 #  #
 # 1) If at all possible, put this source tree in /usr/src.  If /usr/src  # 1) If at all possible, put this source tree in /usr/src.  If /usr/src
 # must be a symbolic link, setenv BSDSRCDIR to point to the real location.  # must be a symbolic link, setenv BSDSRCDIR to point to the real location.
 #  #
Line 25 
Line 25 
 # "make build" target supplied here. Good luck.  # "make build" target supplied here. Good luck.
 #  #
 # 5) If you want to setup a cross-build environment, there is a "cross-tools"  # 5) If you want to setup a cross-build environment, there is a "cross-tools"
 # target available which upon completion of "make TARGET=<target> cross-tools"  # target available which upon completion of "make TARGET=<target> cross-tools"
 # (where <target> is one of the names in the /sys/arch directory) will produce  # (where <target> is one of the names in the /sys/arch directory) will produce
 # a set of compilation tools along with the includes in the /usr/cross/<target>  # a set of compilation tools along with the includes in the /usr/cross/<target>
 # directory.  # directory.
Line 47 
Line 47 
 .endif  .endif
   
 .if   make(clean) || make(cleandir) || make(obj)  .if   make(clean) || make(cleandir) || make(obj)
 SUBDIR+= distrib  SUBDIR+= distrib regress
 .endif  .endif
   
 .if exists(regress)  .if exists(regress)
 .ifmake !(install)  
 SUBDIR+= regress  
 .endif  
   
 regression-tests:  regression-tests:
         @echo Running regression tests...          @echo Running regression tests...
         @cd ${.CURDIR}/regress && exec ${MAKE} regress          @cd ${.CURDIR}/regress && ${MAKE} depend && exec ${MAKE} regress
 .endif  .endif
   
 includes:  includes:
Line 165 
Line 161 
             ${MAKE} DESTDIR=${CROSSDIR} includes              ${MAKE} DESTDIR=${CROSSDIR} includes
   
 .if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \  .if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \
     ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc"      ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc" || ${TARGET} == "sparc"
 cross-binutils: cross-binutils-new cross-binutils-links  cross-binutils: cross-binutils-new cross-binutils-links
 .else  .else
 cross-binutils: cross-binutils-old cross-binutils-links  cross-binutils: cross-binutils-old cross-binutils-links
 .endif  .endif
   
 cross-binutils-new:     cross-dirs  cross-binutils-new:     cross-dirs
         export BSDSRCDIR=`pwd`; \          export BSDSRCDIR=`pwd`; \
             (cd ${.CURDIR}/gnu/usr.bin/binutils; \              (cd ${.CURDIR}/gnu/usr.bin/binutils; \
             BSDOBJDIR=${CROSSDIR}/usr/obj \              BSDOBJDIR=${CROSSDIR}/usr/obj \
Line 188 
Line 184 
         cross-ranlib cross-nm          cross-ranlib cross-nm
   
 cross-binutils-links: cross-dirs  cross-binutils-links: cross-dirs
         for cmd in ar as ld nm ranlib size strip; do \          for cmd in ar as ld nm ranlib objcopy objdump size strings strip; do \
             if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \              if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
                 ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd \                  ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd \
                 ${CROSSDIR}/usr/bin/$$cmd ;\                  ${CROSSDIR}/usr/bin/$$cmd ;\

Legend:
Removed from v.1.79  
changed lines
  Added in v.1.86