tahoe beta update

SCCS-vsn: Makefile 4.16
SCCS-vsn: bin/Makefile 5.24
SCCS-vsn: contrib/Makefile 4.25

diff --git a/usr/src/Makefile b/usr/src/Makefile
index 8219071..6fb37f7 100644 (file)
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -11,7 +11,8 @@
 #      make installsrc
 # The `make build' will compile and install the libraries and the compiler
 # twice before building the rest of the sources.  The `make installsrc' will
 #      make installsrc
 # The `make build' will compile and install the libraries and the compiler
 # twice before building the rest of the sources.  The `make installsrc' will

-# then install the remaining binaries.
+# then install the remaining binaries.  Only `make build' will clean out
+# the source tree as well as remake the dependencies.

 #
 #      make libthenall
 #      make installsrc
 #
 #      make libthenall
 #      make installsrc


@@ -27,15 +28,15 @@
 #
 # C library options: passed to libc makefile.
 # See lib/libc/Makefile for explanation.
 #
 # C library options: passed to libc makefile.
 # See lib/libc/Makefile for explanation.

+#

 # HOSTLOOKUP must be either named or hosttable.
 # DFLMON must be either mon.o or gmon.o.
 # DEFS may include -DLIBC_SCCS, -DSYSLIBC_SCCS, both, or neither.
 #
 # HOSTLOOKUP must be either named or hosttable.
 # DFLMON must be either mon.o or gmon.o.
 # DEFS may include -DLIBC_SCCS, -DSYSLIBC_SCCS, both, or neither.
 #

-HOSTLOOKUP=named
-DFLMON=mon.o
-DEFS= -DLIBC_SCCS
-MACHINE=tahoe
-LIBCDEFS= MACHINE=${MACHINE} HOSTLOOKUP=${HOSTLOOKUP} DFLMON=${DFLMON} DEFS="${DEFS}"
+DEFS=          -DLIBC_SCCS
+DFLMON=                mon.o
+HOSTLOOKUP=    named
+LIBCDEFS=      HOSTLOOKUP=${HOSTLOOKUP} DFLMON=${DFLMON} DEFS="${DEFS}"

 
 # global flags
 # SRC_MFLAGS are used on makes in command source directories,
 
 # global flags
 # SRC_MFLAGS are used on makes in command source directories,


@@ -43,21 +44,20 @@ LIBCDEFS= MACHINE=${MACHINE} HOSTLOOKUP=${HOSTLOOKUP} DFLMON=${DFLMON} DEFS="${D
 # for use in compiling everything else.
 #
 DESTDIR=
 # for use in compiling everything else.
 #
 DESTDIR=

-CFLAGS=        -O
-SRC_MFLAGS = -k
+CFLAGS=                -O
+SRC_MFLAGS=    -k

 
 

-# Programs that live in subdirectories, and have makefiles of their own.
-#
-LIBDIR= lib usr.lib
-SRCDIR=        bin usr.bin etc ucb new games local old
+LIBDIR=        lib usr.lib
+# order is important, old and man must be #1 and #2
+SRCDIR=        old man bin etc games local new ucb usr.bin

 
 all: ${LIBDIR} ${SRCDIR}
 
 libthenall: buildlib1 buildlib3 ${SRCDIR}
 
 
 all: ${LIBDIR} ${SRCDIR}
 
 libthenall: buildlib1 buildlib3 ${SRCDIR}
 

-build: buildlib1 buildlib2 buildlib3 ${SRCDIR}
+build: clean depend buildlib1 buildlib2 buildlib3 ${SRCDIR}

 
 

-lib:   FRC
+lib: FRC

        cd lib/libc; make ${MFLAGS} ${LIBCDEFS}
        cd lib; make ${MFLAGS} pcc cpp c2
 
        cd lib/libc; make ${MFLAGS} ${LIBCDEFS}
        cd lib; make ${MFLAGS} pcc cpp c2
 


@@ -103,26 +103,32 @@ buildlib3: FRC
        cd usr.lib; make ${MFLAGS} ${SRC_MFLAGS} DESTDIR=${DESTDIR} install
        @echo
 
        cd usr.lib; make ${MFLAGS} ${SRC_MFLAGS} DESTDIR=${DESTDIR} install
        @echo
 

-FRC:
-
-install:
+install: FRC

        -for i in ${LIBDIR} ${SRCDIR}; do \
                (cd $$i; \
                make ${MFLAGS} ${SRC_MFLAGS} DESTDIR=${DESTDIR} install); \
        done
 
        -for i in ${LIBDIR} ${SRCDIR}; do \
                (cd $$i; \
                make ${MFLAGS} ${SRC_MFLAGS} DESTDIR=${DESTDIR} install); \
        done
 

-installsrc:
+installsrc: FRC

        -for i in ${SRCDIR}; do \
                (cd $$i; \
                make ${MFLAGS} ${SRC_MFLAGS} DESTDIR=${DESTDIR} install); \
        done
 
        -for i in ${SRCDIR}; do \
                (cd $$i; \
                make ${MFLAGS} ${SRC_MFLAGS} DESTDIR=${DESTDIR} install); \
        done
 

-tags:
+depend: FRC
+       for i in ${LIBDIR} ${SRCDIR}; do \
+               (cd $$i; make ${MFLAGS} depend); \
+       done
+
+tags: FRC

        for i in include lib usr.lib; do \
                (cd $$i; make ${MFLAGS} TAGSFILE=../tags tags); \
        done
        sort -u +0 -1 -o tags tags
 
        for i in include lib usr.lib; do \
                (cd $$i; make ${MFLAGS} TAGSFILE=../tags tags); \
        done
        sort -u +0 -1 -o tags tags
 

-clean:
-       rm -f a.out core *.s *.o
-       for i in ${LIBDIR} ${SRCDIR}; do (cd $$i; make -k ${MFLAGS} clean); done
+clean: FRC
+       for i in ${LIBDIR} ${SRCDIR}; do \
+               (cd $$i; make -k ${MFLAGS} clean); \
+       done
+
+FRC:

diff --git a/usr/src/bin/Makefile b/usr/src/bin/Makefile
index 9072fee..19f062c 100644 (file)
--- a/usr/src/bin/Makefile
+++ b/usr/src/bin/Makefile
@@ -7,10 +7,11 @@
 #
 DESTDIR=
 CFLAGS=        -O
 #
 DESTDIR=
 CFLAGS=        -O

+LIBC=  /lib/libc.a

 
 # Programs that live in subdirectories, and have makefiles of their own.
 #
 
 # Programs that live in subdirectories, and have makefiles of their own.
 #

-SUBDIR=        adb as awk csh diff make sed sh tp
+SUBDIR=        adb as awk csh diff make passwd sed sh tp

 
 # Shell scripts that need only be installed and are never removed.
 #
 
 # Shell scripts that need only be installed and are never removed.
 #


@@ -18,17 +19,18 @@ SCRIPT=     false true
 
 # C source that lives in the current directory
 #
 
 # C source that lives in the current directory
 #

-SRCS=  ar.c cat.c cc.c chgrp.c chmod.c cmp.c date.c dd.c du.c echo.c ed.c \
-       expr.c grep.c hostid.c hostname.c kill.c ld.c ln.c ls.c machine.c \
-       mkdir.c mt.c nice.c nm.c od.c pagesize.c pr.c ps.c pwd.c rm.c \
-       rmail.c rmdir.c size.c stty.c sync.c tar.c tee.c test.c time.c who.c
+SRCS=  ar.c cat.c cc.c chgrp.c chmod.c cmp.c cp.c date.c dd.c df.c du.c \
+       echo.c ed.c expr.c hostid.c hostname.c kill.c ld.c ln.c login.c \
+       ls.c machine.c mail.c mkdir.c mt.c mv.c nice.c nm.c od.c pagesize.c \
+       pr.c ps.c pwd.c rcp.c rm.c rmail.c rmdir.c size.c strip.c \
+       stty.c su.c sync.c tar.c tee.c test.c time.c wall.c who.c write.c

 
 # C programs that live in the current directory and do not need
 # explicit make lines.
 #
 
 # C programs that live in the current directory and do not need
 # explicit make lines.
 #

-STD=   ar cat cc chgrp chmod cmp date dd du echo ed grep hostid \
-       hostname kill ld ln ls machine mkdir mt nice nm od pagesize pr \
-       pwd rm rmail rmdir size stty sync tar tee test time who
+STD=   ar cat cc chgrp chmod cmp cp date dd du echo ed hostid \
+       hostname kill ld ln ls machine mkdir mt mv nice nm od pagesize pr \
+       pwd rm rmail rmdir size strip stty sync tar tee test time who

 
 # C programs that live in the current directory and need explicit make lines.
 #
 
 # C programs that live in the current directory and need explicit make lines.
 #


@@ -36,38 +38,26 @@ NSTD=       expr ps
 
 # Programs that get installed with special permissions
 #
 
 # Programs that get installed with special permissions
 #

-PERM=  df login mail passwd rcp su wall write
+PERM=  df login mail rcp su wall write

 
 

-BINS=  ${STD} ${NSTD} ${PERM} cp mv strip
-
-all:   ${SUBDIR} ${BINS}
+all:   ${SUBDIR} ${STD} ${NSTD} ${PERM}

 
 ${SUBDIR}: FRC
        cd $@; make ${MFLAGS}
 
 
 ${SUBDIR}: FRC
        cd $@; make ${MFLAGS}
 

-${STD} ${PERM} mv cp strip:
+${STD} ${PERM}: ${LIBC}

        ${CC} ${CFLAGS} -o $@ $@.c
 
        ${CC} ${CFLAGS} -o $@ $@.c
 

-# take care with cp, strip, and mv, install uses them

 install: FRC
 install: FRC

-       install -s -o bin -g bin -m 755 cp ${DESTDIR}/bin/newcp; \
-               mv ${DESTDIR}/bin/newcp ${DESTDIR}/bin/cp;
-       install -s -o bin -g bin -m 755 strip ${DESTDIR}/bin/newstrip; \
-               mv ${DESTDIR}/bin/newstrip ${DESTDIR}/bin/strip;
-       install -c -s -o bin -g bin -m 755 mv ${DESTDIR}/bin/mv
-       rm -f mv

        -for i in ${SUBDIR}; do \
                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
        -for i in ${SCRIPT}; do \
                (install -c -o bin -g bin -m 755 $$i.sh ${DESTDIR}/bin/$$i); \
        done
        -for i in ${SUBDIR}; do \
                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
        -for i in ${SCRIPT}; do \
                (install -c -o bin -g bin -m 755 $$i.sh ${DESTDIR}/bin/$$i); \
        done

-       -for i in ${STD}; do \
-               (install -s -o bin -g bin -m 755 $$i ${DESTDIR}/bin/$$i); \
-       done
+       install -o bin -g bin -m 755 ${STD} ${DESTDIR}/bin

 # programs that run with special permissions
        install -s -o root -g bin -m 4755 login ${DESTDIR}/bin/login
        install -s -o root -g bin -m 4755 mail ${DESTDIR}/bin/mail
 # programs that run with special permissions
        install -s -o root -g bin -m 4755 login ${DESTDIR}/bin/login
        install -s -o root -g bin -m 4755 mail ${DESTDIR}/bin/mail

-       install -s -o root -g bin -m 4755 passwd ${DESTDIR}/bin/passwd

        install -s -o root -g bin -m 4755 rcp ${DESTDIR}/bin/rcp
        install -s -o root -g bin -m 4755 su ${DESTDIR}/bin/su
        install -s -o bin -g operator -m 2755 df ${DESTDIR}/bin/df
        install -s -o root -g bin -m 4755 rcp ${DESTDIR}/bin/rcp
        install -s -o root -g bin -m 4755 su ${DESTDIR}/bin/su
        install -s -o bin -g operator -m 2755 df ${DESTDIR}/bin/df


@@ -78,15 +68,15 @@ install: FRC
 # directories and links
        rm -f ${DESTDIR}/bin/[; ln ${DESTDIR}/bin/test ${DESTDIR}/bin/[
        rm -f ${DESTDIR}/bin/e; ln ${DESTDIR}/bin/ed ${DESTDIR}/bin/e
 # directories and links
        rm -f ${DESTDIR}/bin/[; ln ${DESTDIR}/bin/test ${DESTDIR}/bin/[
        rm -f ${DESTDIR}/bin/e; ln ${DESTDIR}/bin/ed ${DESTDIR}/bin/e

-       rm -f ${DESTDIR}/bin/chfn; ln ${DESTDIR}/bin/passwd ${DESTDIR}/bin/chfn
-       rm -f ${DESTDIR}/bin/chsh; ln ${DESTDIR}/bin/passwd ${DESTDIR}/bin/chsh

 
 clean: FRC
 
 clean: FRC

-       rm -f ${BINS} expr.c a.out core *.s *.o errs
+       rm -f ${STD} ${NSTD} ${PERM} expr.c a.out core *.s *.o errs

        for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
 
        for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
 

-depend: expr.c FRC
+depend: ldepend

        for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} depend); done
        for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} depend); done

+
+ldepend: expr.c FRC

        mkdep -p ${CFLAGS} ${SRCS}
 
 FRC:
        mkdep -p ${CFLAGS} ${SRCS}
 
 FRC:


@@ -103,64 +93,103 @@ ps:
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 ar: ar.c /usr/include/sys/param.h /usr/include/sys/types.h
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 ar: ar.c /usr/include/sys/param.h /usr/include/sys/types.h

-ar: /usr/include/signal.h /usr/include/machine/machparam.h
-ar: /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/time.h
-ar: /usr/include/stdio.h /usr/include/ar.h
+ar: /usr/include/signal.h /usr/include/machine/trap.h
+ar: /usr/include/machine/machparam.h /usr/include/sys/stat.h
+ar: /usr/include/sys/time.h /usr/include/time.h /usr/include/stdio.h
+ar: /usr/include/ar.h

 cat: cat.c /usr/include/stdio.h /usr/include/sys/types.h
 cat: /usr/include/sys/stat.h
 cc: cc.c /usr/include/sys/param.h /usr/include/sys/types.h
 cat: cat.c /usr/include/stdio.h /usr/include/sys/types.h
 cat: /usr/include/sys/stat.h
 cc: cc.c /usr/include/sys/param.h /usr/include/sys/types.h

-cc: /usr/include/signal.h /usr/include/machine/machparam.h /usr/include/stdio.h
-cc: /usr/include/ctype.h /usr/include/signal.h /usr/include/sys/dir.h
+cc: /usr/include/signal.h /usr/include/machine/trap.h
+cc: /usr/include/machine/machparam.h /usr/include/stdio.h /usr/include/ctype.h
+cc: /usr/include/signal.h /usr/include/sys/dir.h

 chgrp: chgrp.c /usr/include/stdio.h /usr/include/ctype.h
 chgrp: /usr/include/sys/types.h /usr/include/sys/stat.h /usr/include/grp.h
 chgrp: /usr/include/pwd.h /usr/include/sys/dir.h
 chmod: chmod.c /usr/include/stdio.h /usr/include/sys/types.h
 chmod: /usr/include/sys/stat.h /usr/include/sys/dir.h
 cmp: cmp.c /usr/include/sys/param.h /usr/include/sys/types.h
 chgrp: chgrp.c /usr/include/stdio.h /usr/include/ctype.h
 chgrp: /usr/include/sys/types.h /usr/include/sys/stat.h /usr/include/grp.h
 chgrp: /usr/include/pwd.h /usr/include/sys/dir.h
 chmod: chmod.c /usr/include/stdio.h /usr/include/sys/types.h
 chmod: /usr/include/sys/stat.h /usr/include/sys/dir.h
 cmp: cmp.c /usr/include/sys/param.h /usr/include/sys/types.h

-cmp: /usr/include/signal.h /usr/include/machine/machparam.h
-cmp: /usr/include/sys/file.h /usr/include/sys/stat.h /usr/include/stdio.h
-cmp: /usr/include/ctype.h
+cmp: /usr/include/signal.h /usr/include/machine/trap.h
+cmp: /usr/include/machine/machparam.h /usr/include/sys/file.h
+cmp: /usr/include/sys/stat.h /usr/include/stdio.h /usr/include/ctype.h
+cp: cp.c /usr/include/stdio.h /usr/include/sys/param.h /usr/include/sys/types.h
+cp: /usr/include/signal.h /usr/include/machine/trap.h
+cp: /usr/include/machine/machparam.h /usr/include/sys/stat.h
+cp: /usr/include/sys/dir.h /usr/include/sys/time.h /usr/include/time.h

 date: date.c /usr/include/sys/param.h /usr/include/sys/types.h
 date: date.c /usr/include/sys/param.h /usr/include/sys/types.h

-date: /usr/include/signal.h /usr/include/machine/machparam.h
-date: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/file.h
-date: /usr/include/errno.h /usr/include/syslog.h /usr/include/utmp.h
-date: /usr/include/tzfile.h /usr/include/stdio.h /usr/include/ctype.h
-date: /usr/include/strings.h /usr/include/sys/socket.h
-date: /usr/include/netinet/in.h /usr/include/netdb.h
+date: /usr/include/signal.h /usr/include/machine/trap.h
+date: /usr/include/machine/machparam.h /usr/include/sys/time.h
+date: /usr/include/time.h /usr/include/sys/file.h /usr/include/errno.h
+date: /usr/include/syslog.h /usr/include/utmp.h /usr/include/tzfile.h
+date: /usr/include/stdio.h /usr/include/ctype.h /usr/include/strings.h
+date: /usr/include/sys/socket.h /usr/include/netinet/in.h /usr/include/netdb.h

 date: /usr/include/protocols/timed.h
 dd: dd.c /usr/include/sys/file.h /usr/include/stdio.h /usr/include/signal.h
 date: /usr/include/protocols/timed.h
 dd: dd.c /usr/include/sys/file.h /usr/include/stdio.h /usr/include/signal.h

+dd: /usr/include/machine/trap.h
+df: df.c /usr/include/sys/param.h /usr/include/sys/types.h
+df: /usr/include/signal.h /usr/include/machine/trap.h
+df: /usr/include/machine/machparam.h /usr/include/sys/fs.h
+df: /usr/include/sys/stat.h /usr/include/errno.h /usr/include/stdio.h
+df: /usr/include/fstab.h /usr/include/mtab.h

 du: du.c /usr/include/stdio.h /usr/include/sys/param.h /usr/include/sys/types.h
 du: du.c /usr/include/stdio.h /usr/include/sys/param.h /usr/include/sys/types.h

-du: /usr/include/signal.h /usr/include/machine/machparam.h
-du: /usr/include/sys/stat.h /usr/include/sys/dir.h
+du: /usr/include/signal.h /usr/include/machine/trap.h
+du: /usr/include/machine/machparam.h /usr/include/sys/stat.h
+du: /usr/include/sys/dir.h

 echo: echo.c /usr/include/stdio.h
 echo: echo.c /usr/include/stdio.h

-ed: ed.c /usr/include/signal.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-ed: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h /usr/include/setjmp.h
+ed: ed.c /usr/include/signal.h /usr/include/machine/trap.h /usr/include/sgtty.h
+ed: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
+ed: /usr/include/sys/ttydev.h /usr/include/setjmp.h

 expr: expr.c /usr/include/stdio.h
 expr: expr.c /usr/include/stdio.h

-grep: grep.c /usr/include/stdio.h /usr/include/ctype.h

 hostid: hostid.c /usr/include/sys/types.h /usr/include/stdio.h
 hostid: /usr/include/ctype.h /usr/include/netdb.h
 hostname: hostname.c /usr/include/stdio.h
 hostid: hostid.c /usr/include/sys/types.h /usr/include/stdio.h
 hostid: /usr/include/ctype.h /usr/include/netdb.h
 hostname: hostname.c /usr/include/stdio.h

-kill: kill.c /usr/include/signal.h /usr/include/ctype.h
+kill: kill.c /usr/include/signal.h /usr/include/machine/trap.h
+kill: /usr/include/ctype.h

 ld: ld.c /usr/include/sys/param.h /usr/include/sys/types.h
 ld: ld.c /usr/include/sys/param.h /usr/include/sys/types.h

-ld: /usr/include/signal.h /usr/include/machine/machparam.h
-ld: /usr/include/signal.h /usr/include/stdio.h /usr/include/ctype.h
-ld: /usr/include/ar.h /usr/include/a.out.h /usr/include/sys/exec.h
-ld: /usr/include/ranlib.h /usr/include/sys/stat.h /usr/include/sys/file.h
+ld: /usr/include/signal.h /usr/include/machine/trap.h
+ld: /usr/include/machine/machparam.h /usr/include/signal.h /usr/include/stdio.h
+ld: /usr/include/ctype.h /usr/include/ar.h /usr/include/a.out.h
+ld: /usr/include/sys/exec.h /usr/include/ranlib.h /usr/include/sys/stat.h
+ld: /usr/include/sys/file.h

 ln: ln.c /usr/include/stdio.h /usr/include/sys/types.h /usr/include/sys/stat.h
 ln: /usr/include/errno.h
 ln: ln.c /usr/include/stdio.h /usr/include/sys/types.h /usr/include/sys/stat.h
 ln: /usr/include/errno.h

+login: login.c /usr/include/sys/param.h /usr/include/sys/types.h
+login: /usr/include/signal.h /usr/include/machine/trap.h
+login: /usr/include/machine/machparam.h /usr/include/sys/quota.h
+login: /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/time.h
+login: /usr/include/sys/resource.h /usr/include/sys/file.h /usr/include/sgtty.h
+login: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
+login: /usr/include/sys/ttydev.h /usr/include/utmp.h /usr/include/signal.h
+login: /usr/include/pwd.h /usr/include/stdio.h /usr/include/lastlog.h
+login: /usr/include/errno.h /usr/include/ttyent.h /usr/include/syslog.h
+login: /usr/include/grp.h

 ls: ls.c /usr/include/sys/param.h /usr/include/sys/types.h
 ls: ls.c /usr/include/sys/param.h /usr/include/sys/types.h

-ls: /usr/include/signal.h /usr/include/machine/machparam.h
-ls: /usr/include/sys/stat.h /usr/include/sys/dir.h /usr/include/stdio.h
-ls: /usr/include/sgtty.h /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
+ls: /usr/include/signal.h /usr/include/machine/trap.h
+ls: /usr/include/machine/machparam.h /usr/include/sys/stat.h
+ls: /usr/include/sys/dir.h /usr/include/stdio.h /usr/include/sgtty.h
+ls: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h

 ls: /usr/include/sys/ttydev.h /usr/include/pwd.h /usr/include/grp.h
 ls: /usr/include/utmp.h
 machine: machine.c /usr/include/sys/param.h /usr/include/sys/types.h
 ls: /usr/include/sys/ttydev.h /usr/include/pwd.h /usr/include/grp.h
 ls: /usr/include/utmp.h
 machine: machine.c /usr/include/sys/param.h /usr/include/sys/types.h

-machine: /usr/include/signal.h /usr/include/machine/machparam.h
+machine: /usr/include/signal.h /usr/include/machine/trap.h
+machine: /usr/include/machine/machparam.h
+mail: mail.c /usr/include/sys/param.h /usr/include/sys/types.h
+mail: /usr/include/signal.h /usr/include/machine/trap.h
+mail: /usr/include/machine/machparam.h /usr/include/sys/stat.h
+mail: /usr/include/sys/file.h /usr/include/ctype.h /usr/include/stdio.h
+mail: /usr/include/pwd.h /usr/include/utmp.h /usr/include/signal.h
+mail: /usr/include/setjmp.h /usr/include/sysexits.h /usr/include/sys/socket.h
+mail: /usr/include/netinet/in.h /usr/include/netdb.h

 mkdir: mkdir.c /usr/include/stdio.h
 mt: mt.c /usr/include/stdio.h /usr/include/ctype.h /usr/include/sys/types.h
 mt: /usr/include/sys/mtio.h /usr/include/sys/ioctl.h
 mt: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 mt: /usr/include/tahoevba/cyreg.h
 mkdir: mkdir.c /usr/include/stdio.h
 mt: mt.c /usr/include/stdio.h /usr/include/ctype.h /usr/include/sys/types.h
 mt: /usr/include/sys/mtio.h /usr/include/sys/ioctl.h
 mt: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 mt: /usr/include/tahoevba/cyreg.h

+mv: mv.c /usr/include/sys/param.h /usr/include/sys/types.h
+mv: /usr/include/signal.h /usr/include/machine/trap.h
+mv: /usr/include/machine/machparam.h /usr/include/sys/stat.h
+mv: /usr/include/sys/time.h /usr/include/time.h /usr/include/stdio.h
+mv: /usr/include/sys/dir.h /usr/include/errno.h /usr/include/signal.h

 nice: nice.c /usr/include/stdio.h /usr/include/sys/time.h /usr/include/time.h
 nice: /usr/include/sys/resource.h
 nm: nm.c /usr/include/sys/types.h /usr/include/sys/file.h /usr/include/ar.h
 nice: nice.c /usr/include/stdio.h /usr/include/sys/time.h /usr/include/time.h
 nice: /usr/include/sys/resource.h
 nm: nm.c /usr/include/sys/types.h /usr/include/sys/file.h /usr/include/ar.h


@@ -168,11 +197,11 @@ nm: /usr/include/stdio.h /usr/include/ctype.h /usr/include/a.out.h
 nm: /usr/include/sys/exec.h /usr/include/stab.h /usr/include/ranlib.h
 od: od.c /usr/include/stdio.h /usr/include/sys/types.h /usr/include/sys/stat.h
 pagesize: pagesize.c
 nm: /usr/include/sys/exec.h /usr/include/stab.h /usr/include/ranlib.h
 od: od.c /usr/include/stdio.h /usr/include/sys/types.h /usr/include/sys/stat.h
 pagesize: pagesize.c

-pr: pr.c /usr/include/stdio.h /usr/include/signal.h /usr/include/sys/types.h
-pr: /usr/include/sys/stat.h
+pr: pr.c /usr/include/stdio.h /usr/include/signal.h /usr/include/machine/trap.h
+pr: /usr/include/sys/types.h /usr/include/sys/stat.h

 ps: ps.c /usr/include/stdio.h /usr/include/ctype.h /usr/include/a.out.h
 ps: /usr/include/sys/exec.h /usr/include/pwd.h /usr/include/sys/param.h
 ps: ps.c /usr/include/stdio.h /usr/include/ctype.h /usr/include/a.out.h
 ps: /usr/include/sys/exec.h /usr/include/pwd.h /usr/include/sys/param.h

-ps: /usr/include/sys/types.h /usr/include/signal.h
+ps: /usr/include/sys/types.h /usr/include/signal.h /usr/include/machine/trap.h

 ps: /usr/include/machine/machparam.h /usr/include/sys/ioctl.h
 ps: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 ps: /usr/include/sys/tty.h /usr/include/sys/ttychars.h
 ps: /usr/include/machine/machparam.h /usr/include/sys/ioctl.h
 ps: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 ps: /usr/include/sys/tty.h /usr/include/sys/ttychars.h


@@ -186,32 +215,55 @@ ps: /usr/include/sys/vmmeter.h /usr/include/sys/vmsystm.h
 ps: /usr/include/sys/text.h /usr/include/sys/stat.h /usr/include/sys/mbuf.h
 ps: /usr/include/math.h /usr/include/errno.h /usr/include/utmp.h
 pwd: pwd.c /usr/include/stdio.h /usr/include/sys/param.h
 ps: /usr/include/sys/text.h /usr/include/sys/stat.h /usr/include/sys/mbuf.h
 ps: /usr/include/math.h /usr/include/errno.h /usr/include/utmp.h
 pwd: pwd.c /usr/include/stdio.h /usr/include/sys/param.h

-pwd: /usr/include/sys/types.h /usr/include/signal.h
+pwd: /usr/include/sys/types.h /usr/include/signal.h /usr/include/machine/trap.h

 pwd: /usr/include/machine/machparam.h
 pwd: /usr/include/machine/machparam.h

+rcp: rcp.c /usr/include/sys/param.h /usr/include/sys/types.h
+rcp: /usr/include/signal.h /usr/include/machine/trap.h
+rcp: /usr/include/machine/machparam.h /usr/include/sys/file.h
+rcp: /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/time.h
+rcp: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
+rcp: /usr/include/sys/ttydev.h /usr/include/netinet/in.h /usr/include/stdio.h
+rcp: /usr/include/signal.h /usr/include/pwd.h /usr/include/ctype.h
+rcp: /usr/include/netdb.h /usr/include/errno.h /usr/include/sys/dir.h

 rm: rm.c /usr/include/stdio.h /usr/include/sys/param.h /usr/include/sys/types.h
 rm: rm.c /usr/include/stdio.h /usr/include/sys/param.h /usr/include/sys/types.h

-rm: /usr/include/signal.h /usr/include/machine/machparam.h
-rm: /usr/include/sys/stat.h /usr/include/sys/dir.h /usr/include/sys/file.h
+rm: /usr/include/signal.h /usr/include/machine/trap.h
+rm: /usr/include/machine/machparam.h /usr/include/sys/stat.h
+rm: /usr/include/sys/dir.h /usr/include/sys/file.h

 rmail: rmail.c /usr/include/stdio.h /usr/include/sysexits.h
 rmdir: rmdir.c /usr/include/stdio.h
 size: size.c /usr/include/stdio.h /usr/include/a.out.h /usr/include/sys/exec.h
 rmail: rmail.c /usr/include/stdio.h /usr/include/sysexits.h
 rmdir: rmdir.c /usr/include/stdio.h
 size: size.c /usr/include/stdio.h /usr/include/a.out.h /usr/include/sys/exec.h

+strip: strip.c /usr/include/a.out.h /usr/include/sys/exec.h
+strip: /usr/include/signal.h /usr/include/machine/trap.h /usr/include/stdio.h
+strip: /usr/include/sys/file.h

 stty: stty.c /usr/include/stdio.h /usr/include/sys/ioctl.h
 stty: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 stty: stty.c /usr/include/stdio.h /usr/include/sys/ioctl.h
 stty: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h

+su: su.c /usr/include/stdio.h /usr/include/pwd.h /usr/include/grp.h
+su: /usr/include/syslog.h /usr/include/sys/types.h /usr/include/sys/time.h
+su: /usr/include/time.h /usr/include/sys/resource.h

 sync: sync.c
 tar: tar.c /usr/include/stdio.h /usr/include/sys/param.h
 sync: sync.c
 tar: tar.c /usr/include/stdio.h /usr/include/sys/param.h

-tar: /usr/include/sys/types.h /usr/include/signal.h
+tar: /usr/include/sys/types.h /usr/include/signal.h /usr/include/machine/trap.h

 tar: /usr/include/machine/machparam.h /usr/include/sys/stat.h
 tar: /usr/include/sys/dir.h /usr/include/sys/ioctl.h
 tar: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 tar: /usr/include/sys/mtio.h /usr/include/sys/time.h /usr/include/time.h
 tar: /usr/include/signal.h /usr/include/errno.h /usr/include/fcntl.h
 tar: /usr/include/machine/machparam.h /usr/include/sys/stat.h
 tar: /usr/include/sys/dir.h /usr/include/sys/ioctl.h
 tar: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 tar: /usr/include/sys/mtio.h /usr/include/sys/time.h /usr/include/time.h
 tar: /usr/include/signal.h /usr/include/errno.h /usr/include/fcntl.h

-tee: tee.c /usr/include/signal.h /usr/include/sys/types.h
-tee: /usr/include/sys/stat.h /usr/include/errno.h
+tee: tee.c /usr/include/signal.h /usr/include/machine/trap.h
+tee: /usr/include/sys/types.h /usr/include/sys/stat.h /usr/include/errno.h

 test: test.c /usr/include/stdio.h /usr/include/sys/types.h
 test: /usr/include/sys/stat.h
 time: time.c /usr/include/stdio.h /usr/include/signal.h
 test: test.c /usr/include/stdio.h /usr/include/sys/types.h
 test: /usr/include/sys/stat.h
 time: time.c /usr/include/stdio.h /usr/include/signal.h

-time: /usr/include/sys/types.h /usr/include/sys/time.h /usr/include/time.h
-time: /usr/include/sys/resource.h
+time: /usr/include/machine/trap.h /usr/include/sys/types.h
+time: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/resource.h
+wall: wall.c /usr/include/stdio.h /usr/include/utmp.h /usr/include/errno.h
+wall: /usr/include/signal.h /usr/include/machine/trap.h /usr/include/sys/time.h
+wall: /usr/include/time.h /usr/include/fcntl.h /usr/include/sys/types.h
+wall: /usr/include/sys/stat.h

 who: who.c /usr/include/stdio.h /usr/include/utmp.h /usr/include/pwd.h
 who: /usr/include/ctype.h
 who: who.c /usr/include/stdio.h /usr/include/utmp.h /usr/include/pwd.h
 who: /usr/include/ctype.h

+write: write.c /usr/include/stdio.h /usr/include/ctype.h
+write: /usr/include/sys/types.h /usr/include/sys/stat.h /usr/include/signal.h
+write: /usr/include/machine/trap.h /usr/include/utmp.h /usr/include/sys/time.h
+write: /usr/include/time.h

 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/usr/src/contrib/Makefile b/usr/src/contrib/Makefile
index 081ce9e..e882307 100644 (file)
--- a/usr/src/contrib/Makefile
+++ b/usr/src/contrib/Makefile
@@ -1,43 +1,33 @@
-#      Makefile        4.24    87/07/27
+#
+# Copyright (c) 1987 Regents of the University of California.
+# All rights reserved.  The Berkeley software License Agreement
+# specifies the terms and conditions for redistribution.
+#
+#      @(#)Makefile    4.25    (Berkeley)      %G%

 #
 DESTDIR=
 CFLAGS=        -O
 #
 DESTDIR=
 CFLAGS=        -O

+LIBC=  /lib/libc.a

 
 # Programs that live in subdirectories, and have makefiles of their own.
 #
 
 # Programs that live in subdirectories, and have makefiles of their own.
 #

-SUBDIR=        ansi apl bib courier cpm dsh help hyper icon jove kermit mh \
-       mkmf np100 patch rcs sunrpc tac tools
-#
-# Default programs that are installed
-#
-STDINST=ansi bib emacs jove kermit mh patch rcs
-#
-# Special purpose software that requires custom installation,
-# or may not be needed by all sites
-#
-OPTDIR=        B dipress enet mmdf news nntp notes pathalias rn \
-       spms sumacc umodem xns X X.local/xlock
+SUBDIR=        ansi bib emacs jove kermit mh patch rcs X X/X.local

 
 

-all:   ${STDINST}
+all: ${SUBDIR}

 
 ${SUBDIR}: FRC
        cd $@; make ${MFLAGS}
 
 
 ${SUBDIR}: FRC
        cd $@; make ${MFLAGS}
 

-${OPTDIR}: FRC
-       cd $@; make ${MFLAGS} all
-
-depend:
-

 install:
 install:

-       -for i in ${STDINST}; do \
-               (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
-
-installall:

        -for i in ${SUBDIR}; do \
                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
        -for i in ${SUBDIR}; do \
                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done

+       for file in `find /usr/new/man -type f -name '*.0' -print`; do \
+               sed -n -f /usr/man/makewhatis.sed $$file; \
+       done | sort -u > whatis.db
+       install -o bin -g bin -m 444 whatis.db ${DESTDIR}/usr/new/man/whatis

 
 clean:
        -for i in ${SUBDIR}; do (echo $$i; cd $$i; make ${MFLAGS} clean); done
 
 clean:
        -for i in ${SUBDIR}; do (echo $$i; cd $$i; make ${MFLAGS} clean); done

-       -for i in ${OPTDIR}; do (echo $$i; cd $$i; make ${MFLAGS} clean); done

 
 

+depend:

 FRC:
 FRC: