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

Diff for /src/Makefile between version 1.55 and 1.66

version 1.55, 2000/04/09 07:48:14 version 1.66, 2001/05/14 12:34:26
Line 38 
Line 38 
   
 SUBDIR+= sys lkm  SUBDIR+= sys lkm
   
 .if (${KERBEROS} == "yes")  .if (${KERBEROS:L} == "yes")
 SUBDIR+= kerberosIV  SUBDIR+= kerberosIV
 .endif  .endif
   
Line 53 
Line 53 
   
 regression-tests:  regression-tests:
         @echo Running regression tests...          @echo Running regression tests...
         @(cd ${.CURDIR}/regress && ${MAKE} regress)          @cd ${.CURDIR}/regress && exec ${MAKE} regress
 .endif  .endif
   
 includes:  includes:
         (cd ${.CURDIR}/include; ${MAKE} prereq; ${MAKE} includes)          cd ${.CURDIR}/include && ${MAKE} prereq && exec ${MAKE} includes
   
 beforeinstall:  beforeinstall:
 .ifndef DESTDIR          cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} distrib-dirs
         (cd ${.CURDIR}/etc && ${MAKE} DESTDIR= distrib-dirs)          cd ${.CURDIR}/include && exec ${MAKE} includes
 .else  
         (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)  
 .endif  
         (cd ${.CURDIR}/include; ${MAKE} includes)  
   
 afterinstall:  afterinstall:
 .ifndef NOMAN  .ifndef NOMAN
         (cd ${.CURDIR}/share/man && ${MAKE} makedb)          cd ${.CURDIR}/share/man && exec ${MAKE} makedb
 .endif  .endif
   
 build:  build:
 .ifdef GLOBAL_AUTOCONF_CACHE  .ifdef GLOBAL_AUTOCONF_CACHE
         rm -f ${GLOBAL_AUTOCONF_CACHE}          cp /dev/null ${GLOBAL_AUTOCONF_CACHE}
 .endif  .endif
         (cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)          cd ${.CURDIR}/share/mk && exec ${SUDO} ${MAKE} install
         (cd ${.CURDIR}/include; ${MAKE} prereq; ${SUDO} ${MAKE} includes)          cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes
         ${SUDO} ${MAKE} cleandir          ${SUDO} ${MAKE} cleandir
         (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \          cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
             ${SUDO} ${MAKE} install)              NOMAN=1 exec ${SUDO} ${MAKE} install
         (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \          cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
             ${SUDO} ${MAKE} install)              NOMAN=1 exec ${SUDO} ${MAKE} install
 .if (${KERBEROS} == "yes")  .if (${KERBEROS:L} == "yes")
         (cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \          cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
             ${SUDO} ${MAKE} install)              NOMAN=1 exec ${SUDO} ${MAKE} install
 .endif  .endif
         (cd ${.CURDIR}/gnu/usr.bin/perl && \          cd ${.CURDIR}/gnu/usr.bin/perl && \
             ${MAKE} -f Makefile.bsd-wrapper config.sh && \  
             ${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 && \
             ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib)              exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib
 .if (${MACHINE_ARCH} == "mips")  .if (${MACHINE_ARCH} == "mips")
         ldconfig -R          ldconfig -R
 .endif  .endif
         ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install          ${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
   
 .if !defined(TARGET)  .if !defined(TARGET)
 cross-tools:  cross-tools:
Line 112 
Line 107 
                 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 135 
Line 131 
         @-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 150 
Line 148 
         @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 169 
Line 170 
             (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \              (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \
             /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \              /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
             --prefix ${CROSSDIR}/usr \              --prefix ${CROSSDIR}/usr \
               --disable-nls --disable-gdbtk --disable-commonbfdlib \
             --target `cat ${CROSSDIR}/TARGET_CANON` && \              --target `cat ${CROSSDIR}/TARGET_CANON` && \
             ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install)              ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} install ) && \
         ${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/`cat ${CROSSDIR}/TARGET_CANON`-lorder  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-as \  
             ${CROSSDIR}/usr/bin/as  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ar \  
             ${CROSSDIR}/usr/bin/ar  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ld \  
             ${CROSSDIR}/usr/bin/ld  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strip \  
             ${CROSSDIR}/usr/bin/strip  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-size \  
             ${CROSSDIR}/usr/bin/size  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ranlib \  
             ${CROSSDIR}/usr/bin/ranlib  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-nm \  
             ${CROSSDIR}/usr/bin/nm  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strings \  
             ${CROSSDIR}/usr/bin/strings  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder \  
             ${CROSSDIR}/usr/bin/lorder              ${CROSSDIR}/usr/bin/lorder
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objcopy \  
             ${CROSSDIR}/usr/bin/objcopy  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objdump \  
             ${CROSSDIR}/usr/bin/objdump  
         ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gdb \  
             ${CROSSDIR}/usr/bin/gdb  
   
 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
           for cmd in ar as ld nm ranlib size strip; do \
               ln -sf $$cmd \
               ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd; done
   
 cross-gas:      cross-dirs  cross-gas:      cross-dirs
         (cd ${.CURDIR}/gnu/usr.bin/gas; \          (cd ${.CURDIR}/gnu/usr.bin/gas; \
Line 295 
Line 276 
             /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 334 
Line 316 
             ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \              ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \              DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \
             ${MAKE} NOMAN= install)              ${MAKE} NOMAN= install)
 .if (${KERBEROS} == "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.55  
changed lines
  Added in v.1.66