cleanup; make clean lable work

SCCS-vsn: old/boggle/Makefile 5.8

diff --git a/usr/src/old/boggle/Makefile b/usr/src/old/boggle/Makefile
index 6c6b9f7..b269205 100644 (file)
--- a/usr/src/old/boggle/Makefile
+++ b/usr/src/old/boggle/Makefile
@@ -3,15 +3,11 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    5.7     (Berkeley)      %G%
+#      @(#)Makefile    5.8     (Berkeley)      %G%

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

-CSRCS= comp.c
-COBJS= comp.o
-BSRCS= boggle.c
-BOBJS= boggle.o

 
 all: boggle bogdict
 
 
 all: boggle bogdict
 


@@ -21,17 +17,17 @@ bogdict: comp sfile
                else dict=/usr/dict/words; fi; \
        sed -f sfile $$dict | uniq | ./comp >bogdict
 
                else dict=/usr/dict/words; fi; \
        sed -f sfile $$dict | uniq | ./comp >bogdict
 

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

 
 

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

 
 clean: FRC
        rm -f ${OBJS} core comp boggle bogdict
 
 depend: FRC
 
 clean: FRC
        rm -f ${OBJS} core comp boggle bogdict
 
 depend: FRC

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

 
 install: FRC
        install -s -o games -g bin -m 4700 boggle ${DESTDIR}/usr/games/hide/boggle
 
 install: FRC
        install -s -o games -g bin -m 4700 boggle ${DESTDIR}/usr/games/hide/boggle


@@ -39,8 +35,8 @@ install: FRC
        (cd ${DESTDIR}/usr/games; rm -f boggle; ln -s dm boggle; chown games.bin boggle)
 
 lint: FRC
        (cd ${DESTDIR}/usr/games; rm -f boggle; ln -s dm boggle; chown games.bin boggle)
 
 lint: FRC

-       lint ${CFLAGS} ${CSRCS}
-       lint ${CFLAGS} ${BSRCS}
+       lint ${CFLAGS} comp.c
+       lint ${CFLAGS} boggle.c

 
 tags: FRC
        ctags ${SRCS}
 
 tags: FRC
        ctags ${SRCS}


@@ -50,10 +46,10 @@ FRC:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 

-comp.o: comp.c /usr/include/stdio.h
-boggle.o: boggle.c /usr/include/ctype.h /usr/include/errno.h
-boggle.o: /usr/include/setjmp.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
-boggle.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-boggle.o: /usr/include/signal.h /usr/include/stdio.h
+comp: comp.c /usr/include/stdio.h
+boggle: boggle.c /usr/include/ctype.h /usr/include/errno.h
+boggle: /usr/include/setjmp.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
+boggle: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
+boggle: /usr/include/signal.h /usr/include/machine/trap.h /usr/include/stdio.h

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