diff options
| author | peter <peter@FreeBSD.org> | 1996-08-07 13:25:59 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-08-07 13:25:59 +0000 |
| commit | a19a05bd3985d1546a75311131b918e1e7afb8b3 (patch) | |
| tree | a1734c52b07f582231de3c417cbb62e26dc489ad | |
| parent | 6e88e71ee09755227a0dfe4eef6f3debb699e509 (diff) | |
| download | FreeBSD-src-a19a05bd3985d1546a75311131b918e1e7afb8b3.zip FreeBSD-src-a19a05bd3985d1546a75311131b918e1e7afb8b3.tar.gz | |
Move tsort back to lib-tools where it belongs, and add a "specially
for bootstrap" tweak to the lex Makefile to stop it building the library
too early.
This untangles things a bit more, it stops new bootstraps failing because
libl/libfl uses 'ld -O' before ld is updated.
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/lex/Makefile | 5 |
2 files changed, 7 insertions, 6 deletions
@@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.93 1996/08/03 13:00:35 jkh Exp $ +# $Id: Makefile,v 1.94 1996/08/07 13:21:43 peter Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -342,10 +342,8 @@ bootstrap: ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR} cd ${.CURDIR}/usr.bin/xinstall && ${MAKE} depend && \ ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR} - cd ${.CURDIR}/usr.bin/tsort && ${MAKE} depend && \ - ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR} cd ${.CURDIR}/usr.bin/lex && ${MAKE} bootstrap && ${MAKE} depend && \ - ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR} + ${MAKE} ${MK_FLAGS} -DNOLIB all install ${CLEANDIR} ${OBJDIR} # # include-tools - generally the same as 'bootstrap', except that it's for @@ -401,6 +399,8 @@ includes: # lib-tools - build tools to compile and install the libraries. # lib-tools: + cd ${.CURDIR}/usr.bin/tsort && ${MAKE} depend && \ + ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR} cd ${.CURDIR}/gnu/usr.bin/ld && ${MAKE} depend && \ ${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR} cd ${.CURDIR}/usr.bin/ar && ${MAKE} depend && \ diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index ddc8096..009010e 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1996/05/07 23:19:47 wosch Exp $ +# $Id: Makefile,v 1.5 1996/06/19 20:46:57 nate Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -26,8 +26,9 @@ MLINKS+= lex.1 lex++.1 CLEANFILES+= parse.c parse.h scan.c y.tab.h y.tab.c - +.if !defined(NOLIB) SUBDIR= lib +.endif beforeinstall: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 644 \ |
