From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Mon, 18 Jun 1990 09:49:04 +0000 (-0800)
Subject: pmake style make, reorg the directories
X-Git-Tag: BSD-4_3_Reno-Snapshot-Development~2039
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/522983f73498b074d3523076be24c5537137055b

pmake style make, reorg the directories

SCCS-vsn: usr.bin/f77/pass1.vax/Makefile 5.6
SCCS-vsn: usr.bin/f77/pass1.tahoe/Makefile 5.3
SCCS-vsn: usr.bin/f77/f77.tahoe/Makefile 5.3
---

diff --git a/usr/src/usr.bin/f77/f77.tahoe/Makefile b/usr/src/usr.bin/f77/f77.tahoe/Makefile
index f586cef633..a7c732c3eb 100644
--- a/usr/src/usr.bin/f77/f77.tahoe/Makefile
+++ b/usr/src/usr.bin/f77/f77.tahoe/Makefile
@@ -1,41 +1,8 @@
-#
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that this notice is preserved and that due credit is given
-# to the University of California at 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'' without express or implied warranty.
-#
-#	@(#)Makefile	5.2 (Berkeley) %G%
-#
-CFLAGS=	-DHERE=TAHOE -DTARGET=TAHOE -DFAMILY=PCC -DUCBVAXASM \
-	-DUCBPASS2 -O -I$(INCLDIR)/usr/include -I../include
-LIBC=	/lib/libc.a
-SRCS=	f77.c
-OBJS=	f77.o
+#	@(#)Makefile	5.3 (Berkeley) %G%
 
-all: f77
+PROG=	f77
+CFLAGS+=-DHERE=TAHOE -DTARGET=TAHOE -DFAMILY=PCC -DUCBVAXASM -DUCBPASS2 \
+	-I${.CURDIR}/../include.tahoe
+BINDIR=	/usr/bin
 
-f77: ${SRCS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${SRCS}
-
-clean:
-	rm -f ${OBJS} core f77
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep -p ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 f77 ${DESTDIR}/usr/bin
-
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-	ctags ${SRCS}
+.include <bsd.prog.mk>
diff --git a/usr/src/usr.bin/f77/pass1.tahoe/Makefile b/usr/src/usr.bin/f77/pass1.tahoe/Makefile
index 25ca0ed435..99fd631eea 100644
--- a/usr/src/usr.bin/f77/pass1.tahoe/Makefile
+++ b/usr/src/usr.bin/f77/pass1.tahoe/Makefile
@@ -1,50 +1,26 @@
-#
-# 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	5.2	(Berkeley)	%G%
-#
-CFLAGS=	-O -DHERE=TAHOE -DTARGET=TAHOE -DFAMILY=PCC -DUCBVAXASM \
-	-DUCBPASS2 -I$(INCLDIR)/usr/include -I../include
-LIBC=	/lib/libc.a
-SRCS=	bb.c conv.c data.c equiv.c error.c exec.c expr.c fmt.c gram.c init.c \
+#	@(#)Makefile	5.3 (Berkeley) %G%
+
+PROG=	f77pass1
+CFLAGS+=-DHERE=TAHOE -DTARGET=TAHOE -DFAMILY=PCC -DUCBVAXASM -DUCBPASS2 \
+	-I. -I${.CURDIR} -I${.CURDIR}/../include.tahoe
+SRCS=	bb.c conv.c data.c equiv.c error.c exec.c expr.c fmt.c init.c \
 	intr.c io.c lex.c main.c misc.c optcse.c optim.c optloop.c paramset.c \
 	proc.c put.c putpcc.c regalloc.c setfmt.c stab.c tahoe.c tahoex.c
-OBJS=	bb.o conv.o data.o equiv.o error.o exec.o expr.o fmt.o gram.o init.o \
-	intr.o io.o lex.o main.o misc.o optcse.o optim.o optloop.o paramset.o \
-	proc.o put.o putpcc.o regalloc.o setfmt.o stab.o tahoe.o tahoex.o
-
-all: f77pass1
-
-f77pass1: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
-
-gram.c:	gram.head gram.dcl gram.expr gram.exec gram.io tokdefs.h
-	( sed <tokdefs.h "s/#define/%token/"; \
-		cat gram.head gram.dcl gram.expr gram.exec gram.io ) >gram.in
+OBJS+=	gram.o
+BINDIR=	/usr/libexec
+NOMAN=	noman
+CLEANFILES+=gram.c gram.in y.tab.c tokdefs.h
+
+gram.c: gram.head gram.dcl gram.expr gram.exec gram.io tokdefs.h
+	(sed < tokdefs.h "s/#define/%token/"; cd ${.CURDIR}; \
+	    cat gram.head gram.dcl gram.expr gram.exec gram.io) > gram.in
 	${YACC} gram.in
 	mv y.tab.c gram.c
 
-gram.head: defs.h data.h
-
-tokdefs.h: tokens
-	grep -n . <tokens | sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h
-
-clean:
-	rm -f ${OBJS} core f77pass1 gram.c gram.in
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 f77pass1 ${DESTDIR}/usr/libexec
+tokdefs.h: ${.CURDIR}/tokens
+	(cd ${.CURDIR}; grep -n . < tokens | \
+	    sed "s/\([^:]*\):\(.*\)/#define \2 \1/") > tokdefs.h
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+.include <bsd.prog.mk>
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.depend: tokdefs.h
diff --git a/usr/src/usr.bin/f77/pass1.vax/Makefile b/usr/src/usr.bin/f77/pass1.vax/Makefile
index 9b56081d98..c2652352af 100644
--- a/usr/src/usr.bin/f77/pass1.vax/Makefile
+++ b/usr/src/usr.bin/f77/pass1.vax/Makefile
@@ -1,50 +1,26 @@
-#
-# 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	5.5	(Berkeley)	%G%
-#
-CFLAGS=	-O -DHERE=VAX -DTARGET=VAX -DFAMILY=PCC -DUCBVAXASM \
-	-DUCBPASS2 -DNAMELIST -I../include
-LIBC=	/lib/libc.a
-SRCS=	bb.c conv.c data.c equiv.c error.c exec.c expr.c fmt.c gram.c init.c \
+#	@(#)Makefile	5.6 (Berkeley) %G%
+
+PROG=	f77pass1
+CFLAGS+=-DHERE=VAX -DTARGET=VAX -DFAMILY=PCC -DUCBVAXASM -DUCBPASS2 \
+	-DNAMELIST -I. -I${.CURDIR} -I${.CURDIR}/../include.vax
+SRCS=	bb.c conv.c data.c equiv.c error.c exec.c expr.c fmt.c init.c \
 	intr.c io.c lex.c main.c misc.c optcse.c optim.c optloop.c paramset.c \
 	proc.c put.c putpcc.c regalloc.c setfmt.c stab.c vax.c vaxx.c
-OBJS=	bb.o conv.o data.o equiv.o error.o exec.o expr.o fmt.o gram.o init.o \
-	intr.o io.o lex.o main.o misc.o optcse.o optim.o optloop.o paramset.o \
-	proc.o put.o putpcc.o regalloc.o setfmt.o stab.o vax.o vaxx.o
-
-all: f77pass1
-
-f77pass1: ${OBJS} ${LIBC}
-	${CC} -o $@ ${CFLAGS} ${OBJS}
-
-gram.c:	gram.head gram.dcl gram.expr gram.exec gram.io tokdefs.h
-	( sed <tokdefs.h "s/#define/%token/"; \
-		cat gram.head gram.dcl gram.expr gram.exec gram.io ) >gram.in
+OBJS+=	gram.o
+BINDIR=	/usr/libexec
+NOMAN=	noman
+CLEANFILES+=gram.c gram.in y.tab.c tokdefs.h
+
+gram.c: gram.head gram.dcl gram.expr gram.exec gram.io tokdefs.h
+	(sed < tokdefs.h "s/#define/%token/"; cd ${.CURDIR}; \
+	    cat gram.head gram.dcl gram.expr gram.exec gram.io) > gram.in
 	${YACC} gram.in
 	mv y.tab.c gram.c
 
-gram.head: defs.h data.h
-
-tokdefs.h: tokens
-	grep -n . <tokens | sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h
-
-clean:
-	rm -f ${OBJS} core f77pass1 gram.c gram.in
-
-cleandir: clean
-	rm -f ${MAN} tags .depend
-
-depend: ${SRCS}
-	mkdep ${CFLAGS} ${SRCS}
-
-install: ${MAN}
-	install -s -o bin -g bin -m 755 f77pass1 ${DESTDIR}/usr/libexec
+tokdefs.h: ${.CURDIR}/tokens
+	(cd ${.CURDIR}; grep -n . < tokens | \
+	    sed "s/\([^:]*\):\(.*\)/#define \2 \1/") > tokdefs.h
 
-lint: ${SRCS}
-	lint ${CFLAGS} ${SRCS}
+.include <bsd.prog.mk>
 
-tags: ${SRCS}
-	ctags ${SRCS}
+.depend: tokdefs.h