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

Diff for /src/Makefile between version 1.106 and 1.111

version 1.106, 2004/10/21 20:47:29 version 1.111, 2005/01/09 19:35:26
Line 128 
Line 128 
 ${CROSSDIRS}:  ${CROSSDIRS}:
         @-mkdir -p ${CROSSDIR}          @-mkdir -p ${CROSSDIR}
         @case ${TARGET} in \          @case ${TARGET} in \
                 alpha|hppa|i386|m68k|m88k|powerpc|sparc|sparc64|vax|amd64) \                  alpha|amd64|hppa|hppa64|i386|m68k|m88k|powerpc|sparc|sparc64|vax) \
                         echo ${TARGET} ;;\                          echo ${TARGET} ;;\
                 amiga|hp300|mac68k|mvme68k) \                  amiga|hp300|mac68k|mvme68k) \
                         echo m68k ;;\                          echo m68k ;;\
Line 169 
Line 169 
         @-mkdir -p ${CROSSDIR}/usr/include          @-mkdir -p ${CROSSDIR}/usr/include
         @(cd ${.CURDIR}/include && \          @(cd ${.CURDIR}/include && \
             MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \              MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
               MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} prereq && \              ${MAKE} prereq && \
             MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \              MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
               MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             ${MAKE} DESTDIR=${CROSSDIR} includes)              ${MAKE} DESTDIR=${CROSSDIR} includes)
         @touch ${CROSSINCLUDES}          @touch ${CROSSINCLUDES}
   
 .if ${TARGET} == "alpha" || ${TARGET} == "amd64" || ${TARGET} == "hppa" || \  .if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \
     ${TARGET} == "i386" || ${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || \      ${MACHINE_ARCH} == "vax"
     ${TARGET} == "sparc" || ${TARGET} == "sparc64" || ${TARGET} == "sgi"  BINUTILS=       ar as ld nm ranlib objcopy objdump strings strip
   NEW_BINUTILS?=  No
   .else
 BINUTILS=       ar as gasp ld nm objcopy objdump ranlib readelf size \  BINUTILS=       ar as gasp ld nm objcopy objdump ranlib readelf size \
                 strings strip                  strings strip
 NEW_BINUTILS?=  Yes  NEW_BINUTILS?=  Yes
 .else  
 BINUTILS=       ar as ld nm ranlib objcopy objdump strings strip  
 NEW_BINUTILS?=  No  
 .endif  .endif
   
 ${CROSSBINUTILS}:       ${CROSSINCLUDES}  ${CROSSBINUTILS}:       ${CROSSINCLUDES}
Line 236 
Line 237 
         ln -sf ${CROSSDIR}/usr/bin/strip \          ln -sf ${CROSSDIR}/usr/bin/strip \
             ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip              ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
 .endif  .endif
         (cd ${.CURDIR}/usr.bin/nm; \  
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} \  
             ${MAKE} NOMAN= depend all; \  
             DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \  
             ${MAKE} NOMAN= install)  
         ln -sf ${CROSSDIR}/usr/bin/nm \  
             ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm  
         ln -sf ${CROSSDIR}/usr/bin/size \  
             ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/size  
         @for cmd in ${BINUTILS}; do \          @for cmd in ${BINUTILS}; do \
          if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a \           if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a \
          -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \           -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
Line 266 
Line 258 
 # bsd.own.mk can't do it for us  # bsd.own.mk can't do it for us
 .if ${TARGET} == "amd64" || ${TARGET} == "cats" || \  .if ${TARGET} == "amd64" || ${TARGET} == "cats" || \
     ${TARGET} == "hppa" || ${TARGET} == "hppa64" || \      ${TARGET} == "hppa" || ${TARGET} == "hppa64" || \
       ${TARGET} == "i386" || \
     ${TARGET} == "sparc64" || ${TARGET} == "sgi"      ${TARGET} == "sparc64" || ${TARGET} == "sgi"
 USE_GCC3=yes  USE_GCC3=yes
   .else
   USE_GCC3=no
 .endif  .endif
   
 ${CROSSGCC}:            ${CROSSBINUTILS}  ${CROSSGCC}:            ${CROSSBINUTILS}
Legend:
Removed from v.1.106  
changed lines
  Added in v.1.111