added field name q_ruser; need to update NullAddress

[unix-history] / usr / src / Makefile

diff --git a/usr/src/Makefile b/usr/src/Makefile
index c306bbf..f7f89b8 100644 (file)
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -1,55 +1,47 @@
-#      @(#)Makefile    4.20 (Berkeley) %G%
+#      @(#)Makefile    4.22 (Berkeley) %G%

 
 

-# skip old
-SUBDIR=        bin games include lib libexec old pgrm sbin share usr.bin usr.sbin
+SUBDIR=        bin contrib games include kerberosIV lib libexec old pgrm sbin \
+       share usr.bin usr.sbin

 
 build:
        ${MAKE} cleandir
 
 
 build:
        ${MAKE} cleandir
 

-       @echo +++ installing includes
+       @echo "+++ includes"

        cd include; ${MAKE} depend all install clean
 
        cd include; ${MAKE} depend all install clean
 

-       @echo +++ installing C compiler
+.if ${MACHINE} == "vax" || ${MACHINE} == "tahoe"
+       @echo "+++ C preprocessor, compiler, loader"

        cd pgrm/cpp; ${MAKE} depend all install clean
        cd pgrm/cpp; ${MAKE} depend all install clean

-       cd libexec/c2.${MACHINE}; ${MAKE} depend all install clean

        cd libexec/pcc; ${MAKE} depend all install clean
        cd libexec/pcc; ${MAKE} depend all install clean

+       cd pgrm/ld; ${MAKE} depend all install clean

 
 

-       @echo +++ installing C library
+       @echo "+++ C library"

        cd lib/libc; ${MAKE} depend all install clean
 
        cd lib/libc; ${MAKE} depend all install clean
 

-       @echo +++ re-installing C compiler
-       cd pgrm/cpp; ${MAKE} all install all
-       cd libexec/c2.${MACHINE}; ${MAKE} all install all
-       cd libexec/pcc; ${MAKE} all install all
+       @echo "+++ C preprocessor, compiler, loader (second time)"
+       cd pgrm/cpp; ${MAKE} all install
+       cd libexec/pcc; ${MAKE} all install
+       cd pgrm/ld; ${MAKE} all install
+.endif

 
 

-       @echo +++ installing all libraries
+       @echo "+++ libraries"

        cd lib; ${MAKE} depend all install all
        cd lib; ${MAKE} depend all install all

+       cd kerberosIV; ${MAKE} depend all install all
+
+       @echo "+++ C library tags"

        cd lib/libc; rm -f tags; ${MAKE} tags; \
            install -c -o ${BINOWN} -g ${BINGRP} -m 444 tags /usr/libdata/tags
 
        cd lib/libc; rm -f tags; ${MAKE} tags; \
            install -c -o ${BINOWN} -g ${BINGRP} -m 444 tags /usr/libdata/tags
 

-       @echo +++ installing C library tags file
-
-       @echo +++ libraries done
-       ${MAKE}
+       ${MAKE} depend all

 
 OBJ=   /usr/obj
 
 OBJ=   /usr/obj

-objlinks:
-       -for file in `find ${SUBDIR:S/^/-f /g} name SCCS prune or type dir print`; do \
-               if [ -s $$file/Makefile -a ! -d ${OBJ}/$$file ] ; then \
-                       rm -rf ${OBJ}/$$file; \
-                       mkdir -p ${OBJ}/$$file > /dev/null 2>&1 ; \
-                       rm -f $$file/obj; \
-                       ln -s ${OBJ}/$$file $$file/obj; \
-               fi; \
-       done
-

 shadow:
 shadow:

-       -for file in `find ${SUBDIR:S/^/-f /g} name SCCS prune or type dir print`; do \
-               if [ -s $$file/obj ] ; then \
-                       rm -rf ${OBJ}/$$file; \
-                       mkdir -p ${OBJ}/$$file > /dev/null 2>&1 ; \
-               fi; \
+       @-for file in \
+           `find ${SUBDIR:S/^/-f /g} name SCCS prune or name obj print`; do \
+               d=`dirname $$file`; \
+               echo ${OBJ}/$$d; \
+               mkdir -p ${OBJ}/$$d > /dev/null 2>&1 ; \
+               chown bin.bin ${OBJ}/$$d; \

        done
 
        done
 

-.include <bsd.own.mk>

 .include <bsd.subdir.mk>
 .include <bsd.subdir.mk>