include fixes

[unix-history] / usr / src / bin / Makefile

diff --git a/usr/src/bin/Makefile b/usr/src/bin/Makefile
index 94a5f1b..d2f3213 100644 (file)
--- a/usr/src/bin/Makefile
+++ b/usr/src/bin/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    4.7     (Berkeley)      %G%
+#      @(#)Makefile    4.12    (Berkeley)      %G%

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


@@ -17,29 +17,31 @@ SCRIPT=     false true
 STD=   ar cat cc chgrp chmod cmp date dd df du echo ed expr \
        grep hostid hostname kill ld ln login ls mail mkdir mt nice \
        nm od pagesize passwd pr pwd rm rmail rmdir size strip stty su sync \
 STD=   ar cat cc chgrp chmod cmp date dd df du echo ed expr \
        grep hostid hostname kill ld ln login ls mail mkdir mt nice \
        nm od pagesize passwd pr pwd rm rmail rmdir size strip stty su sync \

-       tee test wall who write
+       tar tee test time wall who write

 
 # Programs that must run setuid to root
 #
 
 # Programs that must run setuid to root
 #

-SETUID=        chgrp df login mail mv passwd su
+SETUID=        chgrp df login mail passwd su

 
 # 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.
 #

-NSTD=  ps tar time
+NSTD=  ps

 
 

-all:   ${SUBDIR} ${STD} ${NSTD} cp
+all:   ${SUBDIR} ${STD} ${NSTD} cp mv

 
 ${SUBDIR}: /tmp
        cd $@; make ${MFLAGS}
 
 
 ${SUBDIR}: /tmp
        cd $@; make ${MFLAGS}
 

-${STD} cp mv:
-       cc ${CFLAGS} -o $@ $@.c
+${STD} mv cp:
+       ${CC} ${CFLAGS} -o $@ $@.c

 
 # take care with cp and mv, install uses them
 install:
        install cp ${DESTDIR}/bin/newcp; \
 
 # take care with cp and mv, install uses them
 install:
        install cp ${DESTDIR}/bin/newcp; \

-               mv ${DESTDIR}/bin/newcp ${DESTDIR}/bin/cp
-       install -c mv ${DESTDIR}/bin/mv; rm -f mv
+               mv ${DESTDIR}/bin/newcp ${DESTDIR}/bin/cp; \
+               strip ${DESTDIR}/bin/cp
+       rm -f ${DESTDIR}/bin/mv; cp mv ${DESTDIR}/bin/mv; rm -f mv; \
+               strip ${DESTDIR}/bin/mv

        for i in ${SUBDIR}; do \
                (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
        for i in ${SCRIPT}; do (install -c $$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 $$i.sh ${DESTDIR}/bin/$$i); done


@@ -77,12 +79,6 @@ depend:
 ps:
        cc ${CFLAGS} -o ps ps.c -lm
 
 ps:
        cc ${CFLAGS} -o ps ps.c -lm
 

-tar:
-       cc ${CFLAGS} -o tar tar.c -ljobs
-
-time:
-       cc ${CFLAGS} -o time time.c -ljobs
-

 # DO NOT DELETE THIS LINE -- make depend uses it
 
 ar: ar.c
 # DO NOT DELETE THIS LINE -- make depend uses it
 
 ar: ar.c


@@ -115,16 +111,9 @@ chmod: /usr/include/sys/stat.h
 cmp: cmp.c
 cmp: /usr/include/stdio.h
 cmp: /usr/include/ctype.h
 cmp: cmp.c
 cmp: /usr/include/stdio.h
 cmp: /usr/include/ctype.h

-cp: cp.c
-cp: /usr/include/stdio.h
-cp: /usr/include/sys/param.h
-cp: /usr/include/sys/stat.h
-cp: /usr/include/dir.h

 date: date.c
 date: /usr/include/stdio.h
 date: /usr/include/time.h
 date: date.c
 date: /usr/include/stdio.h
 date: /usr/include/time.h

-date: /usr/include/sys/types.h
-date: /usr/include/sys/timeb.h

 date: /usr/include/utmp.h
 dd: dd.c
 dd: /usr/include/stdio.h
 date: /usr/include/utmp.h
 dd: dd.c
 dd: /usr/include/stdio.h


@@ -151,6 +140,7 @@ expr: /usr/include/stdio.h
 grep: grep.c
 grep: /usr/include/stdio.h
 grep: /usr/include/ctype.h
 grep: grep.c
 grep: /usr/include/stdio.h
 grep: /usr/include/ctype.h

+hostid: hostid.c

 hostname: hostname.c
 hostname: /usr/include/stdio.h
 kill: kill.c
 hostname: hostname.c
 hostname: /usr/include/stdio.h
 kill: kill.c


@@ -165,20 +155,24 @@ ld: /usr/include/ar.h
 ld: /usr/include/a.out.h
 ld: /usr/include/ranlib.h
 ld: /usr/include/stat.h
 ld: /usr/include/a.out.h
 ld: /usr/include/ranlib.h
 ld: /usr/include/stat.h

-ld: /usr/include/pagsiz.h

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

+ln: /usr/include/errno.h

 login: login.c
 login: /usr/include/sys/types.h
 login: login.c
 login: /usr/include/sys/types.h

+login: /usr/include/sys/quota.h
+login: /usr/include/sys/stat.h
+login: /usr/include/sys/time.h
+login: /usr/include/sys/resource.h

 login: /usr/include/sgtty.h
 login: /usr/include/utmp.h
 login: /usr/include/signal.h
 login: /usr/include/pwd.h
 login: /usr/include/stdio.h
 login: /usr/include/sgtty.h
 login: /usr/include/utmp.h
 login: /usr/include/signal.h
 login: /usr/include/pwd.h
 login: /usr/include/stdio.h

-login: /usr/include/sys/stat.h

 login: /usr/include/lastlog.h
 login: /usr/include/lastlog.h

+login: /usr/include/errno.h

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


@@ -200,11 +194,9 @@ mail: /usr/include/setjmp.h
 mail: /usr/include/sysexits.h
 mail: /usr/include/sys/socket.h
 mail: /usr/include/netinet/in.h
 mail: /usr/include/sysexits.h
 mail: /usr/include/sys/socket.h
 mail: /usr/include/netinet/in.h

+mail: /usr/include/netdb.h

 mkdir: mkdir.c
 mkdir: mkdir.c

-mkdir: /usr/include/signal.h

 mkdir: /usr/include/stdio.h
 mkdir: /usr/include/stdio.h

-mkdir: /usr/include/sys/types.h
-mkdir: /usr/include/stat.h

 mt: mt.c
 mt: /usr/include/stdio.h
 mt: /usr/include/ctype.h
 mt: mt.c
 mt: /usr/include/stdio.h
 mt: /usr/include/ctype.h


@@ -216,13 +208,10 @@ mt: /usr/include/vaxmba/htreg.h
 mt: /usr/include/vaxuba/utreg.h
 mt: /usr/include/vaxuba/tmreg.h
 mt: /usr/include/vaxuba/tsreg.h
 mt: /usr/include/vaxuba/utreg.h
 mt: /usr/include/vaxuba/tmreg.h
 mt: /usr/include/vaxuba/tsreg.h

-mv: mv.c
-mv: /usr/include/stdio.h
-mv: /usr/include/sys/types.h
-mv: /usr/include/sys/stat.h
-mv: /usr/include/signal.h

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

+nice: /usr/include/sys/time.h
+nice: /usr/include/sys/resource.h

 nm: nm.c
 nm: /usr/include/sys/types.h
 nm: /usr/include/ar.h
 nm: nm.c
 nm: /usr/include/sys/types.h
 nm: /usr/include/ar.h


@@ -230,14 +219,18 @@ nm: /usr/include/stdio.h
 nm: /usr/include/ctype.h
 nm: /usr/include/a.out.h
 nm: /usr/include/stab.h
 nm: /usr/include/ctype.h
 nm: /usr/include/a.out.h
 nm: /usr/include/stab.h

-nm: /usr/include/pagsiz.h

 nm: /usr/include/stat.h
 od: od.c
 od: /usr/include/stdio.h
 nm: /usr/include/stat.h
 od: od.c
 od: /usr/include/stdio.h

+od: /usr/include/sys/types.h
+od: /usr/include/sys/stat.h
+pagesize: pagesize.c

 passwd: passwd.c
 passwd: passwd.c

+passwd: /usr/include/sys/file.h

 passwd: /usr/include/stdio.h
 passwd: /usr/include/signal.h
 passwd: /usr/include/pwd.h
 passwd: /usr/include/stdio.h
 passwd: /usr/include/signal.h
 passwd: /usr/include/pwd.h

+passwd: /usr/include/errno.h

 pr: pr.c
 pr: /usr/include/stdio.h
 pr: /usr/include/signal.h
 pr: pr.c
 pr: /usr/include/stdio.h
 pr: /usr/include/signal.h


@@ -246,8 +239,6 @@ pr: /usr/include/sys/stat.h
 pwd: pwd.c
 pwd: /usr/include/stdio.h
 pwd: /usr/include/sys/param.h
 pwd: pwd.c
 pwd: /usr/include/stdio.h
 pwd: /usr/include/sys/param.h

-pwd: /usr/include/sys/stat.h
-pwd: /usr/include/dir.h

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


@@ -255,10 +246,8 @@ rm: /usr/include/sys/stat.h
 rm: /usr/include/dir.h
 rmail: rmail.c
 rmail: /usr/include/stdio.h
 rm: /usr/include/dir.h
 rmail: rmail.c
 rmail: /usr/include/stdio.h

+rmail: /usr/include/sysexits.h

 rmdir: rmdir.c
 rmdir: rmdir.c

-rmdir: /usr/include/sys/param.h
-rmdir: /usr/include/sys/stat.h
-rmdir: /usr/include/dir.h

 rmdir: /usr/include/stdio.h
 size: size.c
 size: /usr/include/stdio.h
 rmdir: /usr/include/stdio.h
 size: size.c
 size: /usr/include/stdio.h


@@ -266,7 +255,6 @@ size: /usr/include/a.out.h
 strip: strip.c
 strip: /usr/include/a.out.h
 strip: /usr/include/signal.h
 strip: strip.c
 strip: /usr/include/a.out.h
 strip: /usr/include/signal.h

-strip: /usr/include/pagsiz.h

 stty: stty.c
 stty: /usr/include/stdio.h
 stty: /usr/include/sgtty.h
 stty: stty.c
 stty: /usr/include/stdio.h
 stty: /usr/include/sgtty.h


@@ -278,25 +266,20 @@ tar: tar.c
 tar: /usr/include/stdio.h
 tar: /usr/include/sys/param.h
 tar: /usr/include/sys/stat.h
 tar: /usr/include/stdio.h
 tar: /usr/include/sys/param.h
 tar: /usr/include/sys/stat.h

-tar: /usr/include/dir.h
+tar: /usr/include/sys/dir.h

 tar: /usr/include/sys/ioctl.h
 tar: /usr/include/sys/mtio.h
 tar: /usr/include/signal.h
 tar: /usr/include/sys/ioctl.h
 tar: /usr/include/sys/mtio.h
 tar: /usr/include/signal.h

+tar: /usr/include/errno.h

 tee: tee.c
 tee: /usr/include/signal.h
 tee: /usr/include/sys/types.h
 tee: /usr/include/sys/stat.h
 tee: /usr/include/errno.h
 tee: tee.c
 tee: /usr/include/signal.h
 tee: /usr/include/sys/types.h
 tee: /usr/include/sys/stat.h
 tee: /usr/include/errno.h

-tee: /usr/include/pagsiz.h

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

-time: time.c
-time: /usr/include/stdio.h
-time: /usr/include/signal.h
-time: /usr/include/sys/types.h
-time: /usr/include/sys/times.h

 wall: wall.c
 wall: /usr/include/stdio.h
 wall: /usr/include/utmp.h
 wall: wall.c
 wall: /usr/include/stdio.h
 wall: /usr/include/utmp.h


@@ -321,15 +304,21 @@ ps: /usr/include/nlist.h
 ps: /usr/include/pwd.h
 ps: /usr/include/sys/param.h
 ps: /usr/include/sys/tty.h
 ps: /usr/include/pwd.h
 ps: /usr/include/sys/param.h
 ps: /usr/include/sys/tty.h

-ps: /usr/include/dir.h
+ps: /usr/include/sys/dir.h

 ps: /usr/include/sys/user.h
 ps: /usr/include/sys/proc.h
 ps: /usr/include/machine/pte.h
 ps: /usr/include/sys/vm.h
 ps: /usr/include/sys/text.h
 ps: /usr/include/sys/stat.h
 ps: /usr/include/sys/user.h
 ps: /usr/include/sys/proc.h
 ps: /usr/include/machine/pte.h
 ps: /usr/include/sys/vm.h
 ps: /usr/include/sys/text.h
 ps: /usr/include/sys/stat.h

+ps: /usr/include/sys/mbuf.h

 ps: /usr/include/math.h
 ps: /usr/include/math.h

-ps: /usr/include/sys/vlimit.h
+time: time.c
+time: /usr/include/stdio.h
+time: /usr/include/signal.h
+time: /usr/include/sys/types.h
+time: /usr/include/time.h
+time: /usr/include/resource.h

 # DEPENDENCIES MUST END AT END OF FILE
 # IF YOU PUT STUFF HERE IT WILL GO AWAY
 # see make depend above
 # DEPENDENCIES MUST END AT END OF FILE
 # IF YOU PUT STUFF HERE IT WILL GO AWAY
 # see make depend above