cleanup, add manual page

SCCS-vsn: usr.bin/at/at/Makefile 5.7
SCCS-vsn: old/awk/Makefile 4.9
SCCS-vsn: usr.bin/find/Makefile 4.6
SCCS-vsn: usr.bin/calendar/Makefile 4.4

diff --git a/usr/src/old/awk/Makefile b/usr/src/old/awk/Makefile
index da937da..182ec5b 100644 (file)
--- a/usr/src/old/awk/Makefile
+++ b/usr/src/old/awk/Makefile
@@ -1,9 +1,20 @@
 #
 #

-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
+# Copyright (c) 1987 The Regents of the University of California.
+# All rights reserved.

 #
 #

-#      @(#)Makefile    4.8     (Berkeley)      %G%
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# by the University of California, Berkeley.  The name of the
+# University may not be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+#      @(#)Makefile    4.9 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -12,6 +23,7 @@ OBJS= awk.lx.o b.o main.o token.o tran.o lib.o run.o parse.o proctab.o \
        freeze.o
 SRCS=  awk.lx.c b.c lib.c main.c parse.c proctab.c freeze.c run.c \
        token.c tran.c
        freeze.o
 SRCS=  awk.lx.c b.c lib.c main.c parse.c proctab.c freeze.c run.c \
        token.c tran.c

+MAN=   awk.0

 
 all: awk
 
 
 all: awk
 


@@ -35,37 +47,21 @@ proctab.c: proc
 proc: awk.h proc.o token.o
        ${CC} -o $@ proc.o token.o
 
 proc: awk.h proc.o token.o
        ${CC} -o $@ proc.o token.o
 

-clean: FRC
-#      use *.o, not ${OBJS}
+clean:

        rm -f *.o core awk awk.h awk.lx.c y.tab.h proc proctab.c yacc* temp
 
        rm -f *.o core awk awk.h awk.lx.c y.tab.h proc proctab.c yacc* temp
 

-depend: y.tab.h ${SRCS} FRC
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: y.tab.h ${SRCS}

        mkdep ${CFLAGS} ${SRCS}
 
        mkdep ${CFLAGS} ${SRCS}
 

-install:
+install: ${MAN}

        install -s -o bin -g bin -m 755 awk ${DESTDIR}/bin/awk
        install -s -o bin -g bin -m 755 awk ${DESTDIR}/bin/awk

+       install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1

 
 

-lint: FRC
+lint: ${SRCS}

        lint ${CFLAGS} ${SRCS}
 
        lint ${CFLAGS} ${SRCS}
 

-tags: proctab.c FRC
+tags: ${SRCS}

        ctags ${SRCS}
        ctags ${SRCS}

-
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-awk.lx.o: awk.lx.c /usr/include/stdio.h awk.h awk.def
-b.o: b.c awk.def /usr/include/stdio.h awk.h
-lib.o: lib.c /usr/include/stdio.h awk.def awk.h /usr/include/ctype.h
-main.o: main.c /usr/include/stdio.h /usr/include/ctype.h awk.def awk.h
-parse.o: parse.c awk.def awk.h /usr/include/stdio.h
-proctab.o: proctab.c awk.def
-freeze.o: freeze.c /usr/include/stdio.h
-run.o: run.c awk.def /usr/include/math.h awk.h /usr/include/stdio.h
-run.o: /usr/include/fcntl.h
-token.o: token.c awk.h
-tran.o: tran.c /usr/include/stdio.h awk.def awk.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/usr/src/usr.bin/at/at/Makefile b/usr/src/usr.bin/at/at/Makefile
index 9d03fee..ac68199 100644 (file)
--- a/usr/src/usr.bin/at/at/Makefile
+++ b/usr/src/usr.bin/at/at/Makefile
@@ -1,9 +1,20 @@
 #
 #

-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.

 #
 #

-#      @(#)Makefile    5.6     (Berkeley)      %G%
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# by the University of California, Berkeley.  The name of the
+# University may not be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+#      @(#)Makefile    5.7 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -12,28 +23,23 @@ OBJS=       atq.o atrm.o at.o atrun.o
 ATRUNDIR=      /usr/lib
 SPOOLDIRS=     /usr/spool/at /usr/spool/at/past
 SPOOLFILES=    /usr/spool/at/lasttimedone
 ATRUNDIR=      /usr/lib
 SPOOLDIRS=     /usr/spool/at /usr/spool/at/past
 SPOOLFILES=    /usr/spool/at/lasttimedone

+MAN=   at.0 atq.0 atrm.0

 
 all: atq atrm at atrun
 
 
 all: atq atrm at atrun
 

-at: at.c ${LIBC}
-       ${CC} ${CFLAGS} -o $@ at.c
-
-atq: atq.c ${LIBC}
-       ${CC} ${CFLAGS} -o $@ atq.c
-
-atrm: atrm.c ${LIBC}
-       ${CC} ${CFLAGS} -o $@ atrm.c
+at atq atrm atrun: ${LIBC}
+       ${CC} ${CFLAGS} -o $@ $@.c

 
 

-atrun: atrun.c ${LIBC}
-       ${CC} ${CFLAGS} -o $@ atrun.c
-
-clean: FRC
+clean:

        rm -f ${OBJS} core atq atrm at atrun
 
        rm -f ${OBJS} core atq atrm at atrun
 

-depend: FRC
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}

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

-install: FRC
+install: ${MAN}

        -for i in ${SPOOLDIRS}; do \
                mkdir ${DESTDIR}/$$i > /dev/null 2>&1; \
                chown root ${DESTDIR}/$$i; \
        -for i in ${SPOOLDIRS}; do \
                mkdir ${DESTDIR}/$$i > /dev/null 2>&1; \
                chown root ${DESTDIR}/$$i; \


@@ -51,40 +57,17 @@ install: FRC
        install -s -o root -g bin -m 4755 atq ${DESTDIR}/usr/bin
        install -s -o root -g bin -m 4755 at ${DESTDIR}/usr/bin
        install -s -o root -g bin -m 4755 atrm ${DESTDIR}/usr/bin
        install -s -o root -g bin -m 4755 atq ${DESTDIR}/usr/bin
        install -s -o root -g bin -m 4755 at ${DESTDIR}/usr/bin
        install -s -o root -g bin -m 4755 atrm ${DESTDIR}/usr/bin

+       install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1

 
 

-lint: FRC
+lint: ${SRCS}

        lint ${CFLAGS} atq.c
        lint ${CFLAGS} atrm.c
        lint ${CFLAGS} at.c
        lint ${CFLAGS} atrun.c
 
        lint ${CFLAGS} atq.c
        lint ${CFLAGS} atrm.c
        lint ${CFLAGS} at.c
        lint ${CFLAGS} atrun.c
 

-tags: FRC
+tags: ${SRCS}

        ctags atq.c
        ctags -a atrm.c
        ctags -a at.c
        ctags -a atrun.c
        sort -o tags tags
        ctags atq.c
        ctags -a atrm.c
        ctags -a at.c
        ctags -a atrun.c
        sort -o tags tags

-
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-atq: atq.c /usr/include/stdio.h /usr/include/sys/types.h
-atq: /usr/include/sys/file.h /usr/include/sys/dir.h /usr/include/sys/stat.h
-atq: /usr/include/sys/time.h /usr/include/time.h /usr/include/pwd.h
-atq: /usr/include/ctype.h
-atrm: atrm.c /usr/include/stdio.h /usr/include/pwd.h /usr/include/ctype.h
-atrm: /usr/include/sys/types.h /usr/include/sys/dir.h /usr/include/sys/file.h
-atrm: /usr/include/sys/stat.h
-at: at.c /usr/include/stdio.h /usr/include/ctype.h /usr/include/signal.h
-at: /usr/include/pwd.h /usr/include/sys/param.h /usr/include/sys/types.h
-at: /usr/include/signal.h /usr/include/machine/machparam.h
-at: /usr/include/sys/time.h /usr/include/time.h /usr/include/sys/file.h
-atrun: atrun.c /usr/include/stdio.h /usr/include/sys/param.h
-atrun: /usr/include/sys/types.h /usr/include/signal.h
-atrun: /usr/include/machine/machparam.h /usr/include/sys/dir.h
-atrun: /usr/include/sys/file.h /usr/include/sys/time.h /usr/include/time.h
-atrun: /usr/include/sys/stat.h /usr/include/pwd.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/usr/src/usr.bin/calendar/Makefile b/usr/src/usr.bin/calendar/Makefile
index cf3e9c3..539af60 100644 (file)
--- a/usr/src/usr.bin/calendar/Makefile
+++ b/usr/src/usr.bin/calendar/Makefile
@@ -1,41 +1,48 @@
 #
 #

-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.

 #
 #

-#      @(#)Makefile    4.3     (Berkeley)      %G%
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# by the University of California, Berkeley.  The name of the
+# University may not be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+#      @(#)Makefile    4.4 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 SRCS=  calendar.c
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 SRCS=  calendar.c

-OBJS=  calendar.o
+OBJS=
+MAN=   calendar.0

 
 all: calendar
 
 
 all: calendar
 

-calendar: calendar.c ${LIBC}
-       ${CC} ${CFLAGS} -o $@ calendar.c
+calendar: ${LIBC}
+       ${CC} ${CFLAGS} -o $@ $@.c

 
 

-clean: FRC
+clean:

        rm -f ${OBJS} core calendar
 
        rm -f ${OBJS} core calendar
 

-depend: FRC
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}

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

-install: FRC
+install: ${MAN}

        install -s -o bin -g bin -m 755 calendar ${DESTDIR}/usr/lib
        install -c -o bin -g bin -m 755 calendar.sh ${DESTDIR}/usr/bin/calendar
        install -s -o bin -g bin -m 755 calendar ${DESTDIR}/usr/lib
        install -c -o bin -g bin -m 755 calendar.sh ${DESTDIR}/usr/bin/calendar

+       install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1

 
 

-lint: FRC
+lint: ${SRCS}

        lint ${CFLAGS} ${SRCS}
 
        lint ${CFLAGS} ${SRCS}
 

-tags: FRC
+tags: ${SRCS}

        ctags ${SRCS}
        ctags ${SRCS}

-
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-calendar.o: calendar.c /usr/include/sys/time.h /usr/include/time.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/usr/src/usr.bin/find/Makefile b/usr/src/usr.bin/find/Makefile
index f51796f..68d9e6d 100644 (file)
--- a/usr/src/usr.bin/find/Makefile
+++ b/usr/src/usr.bin/find/Makefile
@@ -1,61 +1,56 @@
 #
 #

-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.

 #
 #

-#      @(#)Makefile    4.5     (Berkeley)      %G%
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# by the University of California, Berkeley.  The name of the
+# University may not be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+#      @(#)Makefile    4.6 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 SRCS=  find.c bigram.c code.c
 OBJS=  find.o bigram.o code.o
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 SRCS=  find.c bigram.c code.c
 OBJS=  find.o bigram.o code.o

+MAN=   find.0

 
 all: find bigram code
 
 
 all: find bigram code
 

-find: find.c ${LIBC}
-       ${CC} ${CFLAGS} -o $@ find.c
-
-bigram: bigram.c
-       ${CC} ${CFLAGS} -o $@ bigram.c
+bigram code find: ${LIBC}
+       ${CC} ${CFLAGS} -o $@ $@.c

 
 

-code: code.c
-       ${CC} ${CFLAGS} -o $@ code.c
-
-clean: FRC
+clean:

        rm -f ${OBJS} core find bigram code
 
        rm -f ${OBJS} core find bigram code
 

-depend: FRC
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}

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

-install: FRC
+install: ${MAN}

        install -s -o bin -g bin -m 755 find ${DESTDIR}/usr/bin/find
        -[ -d ${DESTDIR}/usr/lib/find ] || mkdir ${DESTDIR}/usr/lib/find
        install -s -o bin -g bin -m 755 bigram ${DESTDIR}/usr/lib/find/bigram
        install -s -o bin -g bin -m 755 code ${DESTDIR}/usr/lib/find/code
        install -c -o bin -g bin -m 755 updatedb.csh ${DESTDIR}/usr/lib/find/updatedb
        install -s -o bin -g bin -m 755 find ${DESTDIR}/usr/bin/find
        -[ -d ${DESTDIR}/usr/lib/find ] || mkdir ${DESTDIR}/usr/lib/find
        install -s -o bin -g bin -m 755 bigram ${DESTDIR}/usr/lib/find/bigram
        install -s -o bin -g bin -m 755 code ${DESTDIR}/usr/lib/find/code
        install -c -o bin -g bin -m 755 updatedb.csh ${DESTDIR}/usr/lib/find/updatedb

+       install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1

 
 

-lint: FRC
+lint: ${SRCS}

        lint ${CFLAGS} find.c
        lint ${CFLAGS} bigram.c
        lint ${CFLAGS} code.c
 
        lint ${CFLAGS} find.c
        lint ${CFLAGS} bigram.c
        lint ${CFLAGS} code.c
 

-tags: FRC
+tags: ${SRCS}

        ctags find.c
        ctags -a bigram.c
        ctags -a code.c
        sort -o tags tags
        ctags find.c
        ctags -a bigram.c
        ctags -a code.c
        sort -o tags tags

-
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-find: find.c /usr/include/stdio.h /usr/include/sys/param.h
-find: /usr/include/sys/types.h /usr/include/signal.h
-find: /usr/include/machine/machparam.h /usr/include/sys/dir.h
-find: /usr/include/sys/stat.h /usr/include/pwd.h /usr/include/grp.h
-find: /usr/include/utmp.h
-bigram: bigram.c /usr/include/stdio.h
-code: code.c /usr/include/stdio.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY