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

Diff for /src/Makefile between version 1.67 and 1.73

version 1.67, 2001/06/24 23:31:07 version 1.73, 2001/08/31 14:13:50
Line 42 
Line 42 
 SUBDIR+= kerberosIV  SUBDIR+= kerberosIV
 .endif  .endif
   
   .if (${KERBEROS5:L} == "yes")
   SUBDIR+= kerberosV
   .endif
   
 .if   make(clean) || make(cleandir) || make(obj)  .if   make(clean) || make(cleandir) || make(obj)
 SUBDIR+= distrib  SUBDIR+= distrib
 .endif  .endif
Line 83 
Line 87 
         cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \          cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
             NOMAN=1 exec ${SUDO} ${MAKE} install              NOMAN=1 exec ${SUDO} ${MAKE} install
 .endif  .endif
   .if (${KERBEROS5:L} == "yes")
           cd ${.CURDIR}/kerberosV/lib && ${MAKE} depend && ${MAKE} && \
               NOMAN=1 exec ${SUDO} ${MAKE} install
   .endif
         cd ${.CURDIR}/gnu/usr.bin/perl && \          cd ${.CURDIR}/gnu/usr.bin/perl && \
             ${MAKE} -f Makefile.bsd-wrapper depend && \              ${MAKE} -f Makefile.bsd-wrapper depend && \
             ${MAKE} -f Makefile.bsd-wrapper perl.lib && \              ${MAKE} -f Makefile.bsd-wrapper perl.lib && \
             exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib              exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib
 .if (${MACHINE_ARCH} == "mips")  
         ldconfig -R  
 .endif  
         ${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install          ${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
   
 .if !defined(TARGET)  .if !defined(TARGET)
Line 109 
Line 114 
                 HOSTCC=cc                  HOSTCC=cc
 CROSSPATH=      ${PATH}:${CROSSDIR}/usr/bin  CROSSPATH=      ${PATH}:${CROSSDIR}/usr/bin
   
   .if (${TARGET} == "sparc64")
   CROSSENV+= CPPFLAGS=-D__arch64__
   CPPFLAGS=-D__arch64__
   .endif
   
 cross-helpers:  cross-helpers:
         mkdir -p ${CROSSDIR}          @-mkdir -p ${CROSSDIR}
         echo _MACHINE_ARCH | \          echo _MACHINE_ARCH | \
             cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \              cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
             ${CPP} -E -I${.CURDIR}/sys/arch | \              ${CPP} ${CPPFLAGS} -E -I${.CURDIR}/sys/arch | \
             sed -n '$$p' >${CROSSDIR}/TARGET_ARCH              sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
 # GROSS KLUDGE  MACHINE_ARCH is mips, but we use mipsel for gnu tools.  
 .if ${TARGET} == "arc" || ${TARGET} == "pmax"  
         eval `grep '^osr=' sys/conf/newvers.sh`; \          eval `grep '^osr=' sys/conf/newvers.sh`; \
            sed "s/\$$/el-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \  
            ${CROSSDIR}/TARGET_CANON  
 .else  
         eval `grep '^osr=' sys/conf/newvers.sh`; \  
            sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \             sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
            ${CROSSDIR}/TARGET_CANON             ${CROSSDIR}/TARGET_CANON
 .endif  
   
 cross-dirs:     ${CROSSDIR}/stamp.dirs  cross-dirs:     ${CROSSDIR}/stamp.dirs
         @-mkdir -p ${CROSSDIR}          @-mkdir -p ${CROSSDIR}
Line 132 
Line 135 
         @-mkdir -p ${CROSSDIR}/usr/bin          @-mkdir -p ${CROSSDIR}/usr/bin
         @-mkdir -p ${CROSSDIR}/usr/include          @-mkdir -p ${CROSSDIR}/usr/include
         @-mkdir -p ${CROSSDIR}/usr/include/kerberosIV          @-mkdir -p ${CROSSDIR}/usr/include/kerberosIV
           @-mkdir -p ${CROSSDIR}/usr/include/kerberosV
         @-mkdir -p ${CROSSDIR}/usr/lib          @-mkdir -p ${CROSSDIR}/usr/lib
         @-mkdir -p ${CROSSDIR}/usr/libexec          @-mkdir -p ${CROSSDIR}/usr/libexec
         @-mkdir -p ${CROSSDIR}/var/db          @-mkdir -p ${CROSSDIR}/var/db
Line 154 
Line 158 
             MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \              MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
             ${MAKE} DESTDIR=${CROSSDIR} includes              ${MAKE} DESTDIR=${CROSSDIR} includes
   
 .if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \  .if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \
     ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa"      ${TARGET} == "sparc64"
 cross-binutils: cross-binutils-new  cross-binutils: cross-binutils-new cross-binutils-links
 .else  .else
 cross-binutils: cross-binutils-old  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 179 
Line 183 
   
 cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \  cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \
         cross-ranlib cross-nm          cross-ranlib cross-nm
   
   cross-binutils-links: cross-dirs
         for cmd in ar as ld nm ranlib size strip; do \          for cmd in ar as ld nm ranlib size strip; do \
             ln -sf $$cmd \              if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
             ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd; done                  ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd \
                   ${CROSSDIR}/usr/bin/$$cmd ;\
               elif [ -e ${CROSSDIR}/usr/bin/$$cmd -a ! -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
                   ln -sf ${CROSSDIR}/usr/bin/$$cmd \
                   ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd; \
               fi ;\
           done
   
 cross-gas:      cross-dirs  cross-gas:      cross-dirs
         (cd ${.CURDIR}/gnu/usr.bin/gas; \          (cd ${.CURDIR}/gnu/usr.bin/gas; \
Line 285 
Line 297 
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \          ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \
             ${CROSSDIR}/usr/bin/cc              ${CROSSDIR}/usr/bin/cc
         ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \          ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
             ${CROSSDIR}/usr/obj/gnu/egcs/gcc/xcpp \              ${CROSSDIR}/usr/obj/gnu/egcs/gcc/cccp \
             ${CROSSDIR}/usr/libexec/cpp              ${CROSSDIR}/usr/libexec/cpp
         sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \          sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \
             -e 's#/usr/include#${CROSSDIR}/usr/include#' \              -e 's#/usr/include#${CROSSDIR}/usr/include#' \
Line 320 
Line 332 
         MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \          MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
         export MACHINE MACHINE_ARCH; \          export MACHINE MACHINE_ARCH; \
         cd kerberosIV/lib; \          cd kerberosIV/lib; \
           BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
               MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
           ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               ${MAKE} NOMAN= depend; \
           ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
           ${CROSSENV} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               ${MAKE} NOMAN= install
   .endif
   .if (${KERBEROS5:L} == "yes")
           MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
           export MACHINE MACHINE_ARCH; \
           cd kerberosV/lib; \
         BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \          BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
         ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \          ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
Legend:
Removed from v.1.67  
changed lines
  Added in v.1.73