X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/3d1acd9a792ba3f0b58c675f38985b3e3d081c3b..af359dea2e5ab3e937b62107ecd6a51d78189ed7:/usr/src/sys/tahoe/conf/Makefile.tahoe

diff --git a/usr/src/sys/tahoe/conf/Makefile.tahoe b/usr/src/sys/tahoe/conf/Makefile.tahoe
index 1c00d8b2c1..8409ab975a 100644
--- a/usr/src/sys/tahoe/conf/Makefile.tahoe
+++ b/usr/src/sys/tahoe/conf/Makefile.tahoe
@@ -1,16 +1,16 @@
-#	@(#)Makefile.tahoe	1.12 (Berkeley) %G%
+#	%W% (Berkeley) %G%
 #
-# Makefile for 4.3 BSD
+# Makefile for 4.4 BSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
-#	/sys/conf/``machineid''
+#	/sys/tahoe/conf/``machineid''
 # after which you should do
 #	 config machineid
-# Generic makefile changes should be made in
+# Machine generic makefile changes should be made in
 #	/sys/conf/Makefile.``machinetype''
-# after which config should be rerun for all machines.
+# after which config should be rerun for all machines of that type.
 #
 # N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE
 #	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
@@ -18,16 +18,19 @@
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas
 #
-C2=	/lib/c2
-LD=	/bin/ld
-TOUCH=	touch -f -c
-INDIR=	../tahoe/inline
-INLINE=	${INDIR}/inline
+C2=	/usr/old/libexec/c2
+LD=	/usr/bin/ld
 
-INCLUDES= -I. -I../h
+S=	../..
+TAHOE=	../../tahoe
+
+INCLUDES= -I. -I$S -I$S/sys
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL
 CFLAGS=	-O ${COPTS}
 
+INLINECMD=	${TAHOE}/inline/obj/inline
+INLINE=	${INLINECMD} ${INLINEOPTS}
+
 %OBJS
 
 %CFILES
@@ -36,29 +39,29 @@ CFLAGS=	-O ${COPTS}
 
 clean:
 	rm -f eddep *vmunix tags *.o locore.i [a-uw-z]*.s \
-		errs linterrs makelinks
+		Errs errs linterrs makelinks
 
 lint: /tmp param.c
 	@lint -hbxn -I. -DGENERIC ${COPTS} ${PARAM} \
-	  ../tahoe/Locore.c ${CFILES} ioconf.c param.c | \
+	  ${TAHOE}/tahoe/Locore.c ${CFILES} ioconf.c param.c | \
 	    grep -v 'struct/union .* never defined' | \
 	    grep -v 'possible pointer alignment problem'
 
-../tahoe/symbols.sort: ../tahoe/symbols.raw
-	grep -v '^#' ../tahoe/symbols.raw \
-	    | sed 's/^	//' | sort -u > ../tahoe/symbols.sort
+symbols.sort: ${TAHOE}/tahoe/symbols.raw
+	grep -v '^#' ${TAHOE}/tahoe/symbols.raw \
+	    | sed 's/^	//' | sort -u > symbols.sort
 
-${INLINE}: ${INDIR}/inline.h ${INDIR}/langpats.c
-${INLINE}: ${INDIR}/libcpats.c ${INDIR}/machdep.c
-${INLINE}: ${INDIR}/machpats.c ${INDIR}/main.c
-	cd ${INDIR}; make
+${INLINECMD}:
+	cd ${TAHOE}/inline; make
 
-locore.o: assym.s ../tahoe/scb.s vbvec.s ../tahoe/locore.s \
-    vbglue.s ../tahoe/mtpr.h ../tahoe/trap.h ../tahoe/psl.h \
-    ../tahoe/pte.h ../tahoe/cp.h ../tahoe/mem.h
-	cat assym.s ../tahoe/scb.s vbvec.s ../tahoe/locore.s \
+locore.o: assym.s ${TAHOE}/tahoe/scb.s vbvec.s ${TAHOE}/tahoe/locore.s 
+locore.o: vbglue.s ${TAHOE}/include/mtpr.h ${TAHOE}/include/trap.h 
+locore.o: ${TAHOE}/include/psl.h ${TAHOE}/include/pte.h ${TAHOE}/tahoe/cp.h
+locore.o: ${TAHOE}/tahoe/mem.h
+locore.o:
+	cat assym.s ${TAHOE}/tahoe/scb.s vbvec.s ${TAHOE}/tahoe/locore.s \
 	    vbglue.s > locore.c
-	${CC} -E -I. -DLOCORE ${COPTS} locore.c > locore.i
+	${CC} -E -DLOCORE ${COPTS} locore.c > locore.i
 	@echo 'as -o locore.o locore.i'
 	@${AS} -o locore.o locore.i
 	@rm locore.i
@@ -75,30 +78,19 @@ assym.s machdep.o: Makefile
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
-assym.s: ../h/param.h ../tahoe/pte.h ../h/buf.h ../h/vmparam.h \
-    ../h/vmmeter.h ../h/dir.h ../h/cmap.h ../h/map.h ../tahoevba/vbaparam.h \
-    ../h/proc.h ../h/msgbuf.h ../tahoe/scb.h
-	${CC} ${INCLUDES} -DKERNEL ${IDENT} ${PARAM} ../tahoe/genassym.c
-	./a.out >assym.s; rm -f a.out
-
-depend:	assym.s
-	${CC} -M ${COPTS} ${CFILES} | \
-	sed -e ':loop' \
-	    -e 's/\.\.\/[^ /]*\/\.\./../' \
-	    -e 't loop' | \
-	awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
-		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
-		       else rec = rec " " $$2 } } \
-	      END { print rec } ' > makedep
-	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-	echo '$$r makedep' >>eddep
-	echo 'w' >>eddep
-	cp Makefile Makefile.bak
-	ex - Makefile < eddep
-	rm eddep makedep
+assym.s: genassym
+	./genassym >assym.s
+
+genassym:
+	${CC} ${INCLUDES} ${IDENT} ${PARAM} -o genassym \
+	    ${TAHOE}/tahoe/genassym.c
+
+depend: assym.s
+	mkdep ${COPTS} ${CFILES} ioconf.c
+	mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${TAHOE}/tahoe/genassym.c
 
 links:
-	egrep '#if' ${CFILES} | sed -f ../conf/defines | \
+	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
@@ -108,30 +100,13 @@ links:
 	sh makelinks && rm -f dontlink
 
 tags:
-	/usr/ucb/ctags ${CFILES}
-
-print:
-	@pr -f Makefile ../sys/TODO linterrs
-	@/usr/ucb/ctags -x ${CFILES} | pr -f -h XREF
-	@(size vmunix *.o) | pr -f -h sizes
-	@ls -ls | pr -f
-	@cd ../h; ls -ls | pr -f ; pr -f *.m *.h
-	@echo 'once upon a time ...'
-	@cd ../tahoe; pr -f Locore.c scb.s locore.s
-	@cd ${INDIR}; make print
-	@pr -f ${CFILES}
-
-ioconf.o: ioconf.c ../h/param.h ../tahoe/pte.h ../h/buf.h ../h/map.h \
-    ../h/vm.h ../tahoevba/vbavar.h
-
-param.c: ../conf/param.c
-	-rm -f param.c
-	cp ../conf/param.c .
+	@echo "see $S/kern/Makefile for tags"
+
+param.c: $S/conf/param.c
+	rm -f param.c
+	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
 %RULES
-
-# DO NOT DELETE THIS LINE -- make depend uses it
-