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

Diff for /src/Makefile between version 1.62 and 1.63

version 1.62, 2001/01/17 20:14:04 version 1.63, 2001/01/27 00:58:23
Line 111 
Line 111 
                 RANLIB=${CROSSDIR}/usr/bin/ranlib \                  RANLIB=${CROSSDIR}/usr/bin/ranlib \
                 SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \                  SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
                 HOSTCC=cc                  HOSTCC=cc
   CROSSPATH=      ${PATH}:${CROSSDIR}/usr/bin
   
 cross-helpers:  cross-helpers:
         mkdir -p ${CROSSDIR}          mkdir -p ${CROSSDIR}
Line 134 
Line 135 
         @-mkdir -p ${CROSSDIR}/usr/obj          @-mkdir -p ${CROSSDIR}/usr/obj
         @-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/lib          @-mkdir -p ${CROSSDIR}/usr/lib
           @-mkdir -p ${CROSSDIR}/usr/libexec
         @-mkdir -p ${CROSSDIR}/var/db          @-mkdir -p ${CROSSDIR}/var/db
         @-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`          @-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`
         @ln -sf ${CROSSDIR}/usr/include \          @ln -sf ${CROSSDIR}/usr/include \
Line 149 
Line 152 
         @touch ${CROSSDIR}/stamp.dirs          @touch ${CROSSDIR}/stamp.dirs
   
 cross-includes: cross-dirs  cross-includes: cross-dirs
         export MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` ;\          cd include; \
               MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
               ${MAKE} prereq && \
               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} == "arc" || \
Line 170 
Line 176 
             --prefix ${CROSSDIR}/usr \              --prefix ${CROSSDIR}/usr \
             --disable-nls --disable-gdbtk --disable-commonbfdlib \              --disable-nls --disable-gdbtk --disable-commonbfdlib \
             --target `cat ${CROSSDIR}/TARGET_CANON` && \              --target `cat ${CROSSDIR}/TARGET_CANON` && \
             ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} install)              ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} install && \
               for cmd in addr2line ar as gasp gdb ld nm objcopy objdump ranlib \
               readelf size strings strip; do \
               ln -sf `cat ${CROSSDIR}/TARGET_CANON`-$$cmd \
               ${CROSSDIR}/usr/bin/$$cmd; done)
         ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \          ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
             ${.CURDIR}/usr.bin/lorder/lorder.sh \              ${.CURDIR}/usr.bin/lorder/lorder.sh \
             ${CROSSDIR}/usr/bin/lorder              ${CROSSDIR}/usr/bin/lorder
Line 271 
Line 281 
             /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \              /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \
             --prefix ${CROSSDIR}/usr \              --prefix ${CROSSDIR}/usr \
             --target `cat ${CROSSDIR}/TARGET_CANON` && \              --target `cat ${CROSSDIR}/TARGET_CANON` && \
             ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \              PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES=c \
             build_infodir=. \              LDFLAGS=${LDSTATIC} build_infodir=. \
             GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \              GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
             ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \              ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \
             GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \              GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \
             build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)              build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
         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
         CPP=`${CROSSDIR}/usr/bin/cc -print-libgcc-file-name | \          ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
             sed 's/libgcc\.a/cpp/'`; \              ${CROSSDIR}/usr/obj/gnu/egcs/gcc/xcpp \
             sed -e 's#/usr/libexec/cpp#'$$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#' \
             ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp              ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp
         chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp          chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
         chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp          chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/bin/cpp
   
 # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later  # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
 cross-lib:      cross-dirs  cross-lib:      cross-dirs
Line 311 
Line 322 
             DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \              DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
 .if (${KERBEROS:L} == "yes")  .if (${KERBEROS:L} == "yes")
         (cd kerberosIV; \          MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
             BSDOBJDIR=${CROSSDIR}/usr/obj \          export MACHINE MACHINE_ARCH; \
             BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \          cd kerberosIV/lib; \
             ${MAKE} obj; \          BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
             for lib in acl krb kadm kafs kdb; do \              MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
                 (cd $$lib; \          ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                     ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              ${MAKE} NOMAN= depend; \
                     ${MAKE} NOMAN= depend; \          ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
                     ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \          ${CROSSENV} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                     ${MAKE} NOMAN=; \              ${MAKE} NOMAN= install
                     DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \  
                     ${MAKE} NOMAN= install); \  
             done)  
 .endif  .endif
 .endif  .endif
   

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63