diff options
| author | paul <paul@FreeBSD.org> | 1994-09-03 02:38:28 +0000 |
|---|---|---|
| committer | paul <paul@FreeBSD.org> | 1994-09-03 02:38:28 +0000 |
| commit | 2e1d38a646c7164135183d8142b880bd62d7946e (patch) | |
| tree | 28716eea78f2b11488babd139bbae460d901f16a /Makefile | |
| parent | 399e5eca6e3767d62af1e89d06df0a0b2a153ba2 (diff) | |
| download | FreeBSD-src-2e1d38a646c7164135183d8142b880bd62d7946e.zip FreeBSD-src-2e1d38a646c7164135183d8142b880bd62d7946e.tar.gz | |
Taken update rule out of world target so it doesn't try and sup and
update every time you build world if you've enabled it.
Merged all the gnu library targets into one. libg++ isn't in the
gnu/lib/Makefile anyway so it's still disabled.
Enabled building of lex library -- this was stopping make world working.
Submitted by: Paul Richards
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 5 insertions, 14 deletions
@@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.13 1994/08/26 20:16:58 paul Exp $ +# $Id: Makefile,v 1.14 1994/08/26 20:44:12 paul Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include and MOST of /usr/lib @@ -85,7 +85,7 @@ CLEANDIR= clean CLEANDIR= cleandir .endif -world: directories update cleandist mk includes libraries tools +world: directories cleandist mk includes libraries tools @echo "--------------------------------------------------------------" @echo " Rebuilding ${DESTDIR} The whole thing" @echo "--------------------------------------------------------------" @@ -177,14 +177,7 @@ libraries: find ${DESTDIR}/usr/lib \! -name '*.s[ao].*' -a \! -type d | \ xargs rm -rf .endif - # XXX The whole GNU block should be doable in one command, as soon # as libg++ works on FreeBSD 2.0 I will try that out -#XXX cd ${.CURDIR}/gnu/lib/libg++ && \ -#XXX ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} - cd ${.CURDIR}/gnu/lib/libmalloc && \ - ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} - cd ${.CURDIR}/gnu/lib/libreadline && \ - ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} - cd ${.CURDIR}/gnu/lib/libregex && \ + cd ${.CURDIR}/gnu/lib && \ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} cd ${.CURDIR}/gnu/usr.bin/cc/libgcc && \ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} @@ -196,10 +189,8 @@ libraries: cd ${.CURDIR}/lib && \ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} .endif - # You need the lex lib before you can build kerberosIV -#XXX # We don't have lex in the 2.0 tree yet! -#XXX cd ${.CURDIR}/usr.bin/lex/lib && \ -#XXX ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} + cd ${.CURDIR}/usr.bin/lex/lib && \ + ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} .if !defined(NOCRYPT) && !defined(NOKERBEROS) cd ${.CURDIR}/kerberosIV/acl && \ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} |
