diff options
author | ru <ru@FreeBSD.org> | 2003-07-01 12:57:53 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2003-07-01 12:57:53 +0000 |
commit | f71aabaec8193debe1772b8eb2160ddfd45f22c5 (patch) | |
tree | 8de55e62a99453e359ae851bc7ae18d1bac55f8b /Makefile.inc1 | |
parent | b060e14e1b2d1925a6b597ce718ee73f002f7036 (diff) | |
download | FreeBSD-src-f71aabaec8193debe1772b8eb2160ddfd45f22c5.zip FreeBSD-src-f71aabaec8193debe1772b8eb2160ddfd45f22c5.tar.gz |
Put rescue/ into a correct slot in the SUBDIR list. Sort bootstrap-,
build-, and cross-tools lists, reformat lists for easier maintenance.
Submitted by: bde, ru
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 78 |
1 files changed, 51 insertions, 27 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 11c760d..39f7881 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -50,10 +50,6 @@ SUBDIR+= include SUBDIR+= lib .endif -.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) -SUBDIR+= rescue -.endif - .if exists(${.CURDIR}/bin) SUBDIR+= bin .endif @@ -70,6 +66,9 @@ SUBDIR+= kerberos5 .if exists(${.CURDIR}/libexec) SUBDIR+= libexec .endif +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) +SUBDIR+= rescue +.endif .if exists(${.CURDIR}/sbin) SUBDIR+= sbin .endif @@ -678,11 +677,21 @@ _kbdcontrol= usr.sbin/kbdcontrol .endif bootstrap-tools: -.for _tool in ${_strfile} usr.bin/colldef \ - usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ - ${_xargs} usr.bin/xinstall ${_yacc} \ - usr.sbin/config ${_crunchgen} ${_kbdcontrol} \ - ${_gperf} ${_groff} gnu/usr.bin/texinfo +.for _tool in \ + ${_strfile} \ + ${_gperf} \ + ${_groff} \ + gnu/usr.bin/texinfo \ + usr.bin/colldef \ + usr.bin/makewhatis \ + usr.bin/rpcgen \ + ${_uudecode} \ + ${_xargs} \ + usr.bin/xinstall \ + ${_yacc} \ + usr.sbin/config \ + ${_crunchgen} \ + ${_kbdcontrol} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -713,9 +722,18 @@ _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ .endif build-tools: -.for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \ - ${_libkrb5} lib/libncurses ${_share} \ - ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall +.for _tool in \ + bin/csh \ + bin/sh \ + gnu/usr.bin/cc/cc_tools \ + ${_fortran} \ + ${_libkrb5} \ + lib/libncurses \ + ${_share} \ + ${_aicasm} \ + usr.bin/awk \ + usr.bin/file \ + usr.sbin/sysinstall @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -725,34 +743,40 @@ build-tools: # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} -_elf2exe= usr.sbin/elf2exe -.endif - -.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} -_btxld= usr.sbin/btxld -.if defined(RELEASEDIR) -_kgzip= usr.sbin/kgzip -.endif -.endif - .if ${TARGET_ARCH} == "sparc64" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ ${BOOTSTRAPPING} < 500037 _elf2aout= usr.bin/elf2aout .endif +.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} +_btxld= usr.sbin/btxld +.endif + .if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \ defined(RELEASEDIR)) && \ ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 ) _crunchide= usr.sbin/crunch/crunchide .endif -_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint +.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} +_elf2exe= usr.sbin/elf2exe +.endif + +.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ + defined(RELEASEDIR) +_kgzip= usr.sbin/kgzip +.endif cross-tools: -.for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ - gnu/usr.bin/binutils ${_crunchide} \ - gnu/usr.bin/cc ${_xlint} ${_kgzip} +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc \ + ${_elf2aout} \ + usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ + ${_btxld} \ + ${_crunchide} \ + ${_elf2exe} \ + ${_kgzip} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ |