Invoke genassym.sh with both m68k/m68k/genassym.cf and

machine/machine/genassym.cf files (poor man's inclusion).

5 files changed, 48 insertions, 31 deletions

diff --git a/sys/arch/amiga/conf/Makefile.amiga b/sys/arch/amiga/conf/Makefile.amiga
index f8287ba9f2c..ac1b2c63468 100644
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amiga,v 1.26 2001/07/15 13:10:47 assar Exp $
+#	$OpenBSD: Makefile.amiga,v 1.27 2001/08/30 22:10:14 miod Exp $
 #	$NetBSD: Makefile.amiga,v 1.60 1997/07/23 10:19:42 is Exp $
 
 # Makefile for OpenBSD
@@ -35,6 +35,7 @@ TOUCH?=	touch -f -c
 S!=	cd ../../../..; pwd
 .endif
 AMIGA=	$S/arch/amiga
+M68K=	$S/arch/m68k
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmc68020 -Damiga
@@ -75,10 +76,10 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
 ### for the Motorola 68040 Floating Point Software Product
-.include "$S/arch/m68k/fpsp/Makefile.inc"
+.include "${M68K}/fpsp/Makefile.inc"
 
 ### for the Motorola 68060 Software Support Package
-.include "$S/arch/m68k/060sp/Makefile.inc"
+.include "${M68K}/060sp/Makefile.inc"
 
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
@@ -124,9 +125,11 @@ LINKFLAGS+=	-S
 
 %LOAD
 
-assym.h: ${AMIGA}/amiga/genassym.cf $S/kern/genassym.sh
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-	    < ${AMIGA}/amiga/genassym.cf > assym.h.tmp && \
+assym.h: $S/kern/genassym.sh \
+	 ${M68K}/m68k/genassym.cf ${AMIGA}/amiga/genassym.cf
+	cat ${M68K}/m68k/genassym.cf ${AMIGA}/amiga/genassym.cf | \
+	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    > assym.h.tmp && \
 	mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index b30637ef7c9..f2e7f128350 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.21 2001/07/15 13:10:47 assar Exp $
+#	$OpenBSD: Makefile.hp300,v 1.22 2001/08/30 22:10:18 miod Exp $
 #	$NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $
 
 # Makefile for OpenBSD
@@ -35,6 +35,7 @@ COPTS?=		-O2
 S!=	cd ../../../..; pwd
 .endif
 HP300=	$S/arch/hp300
+M68K=	$S/arch/m68k
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
@@ -67,7 +68,7 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
 ### for the Motorola 68040 Floating Point Software Product
-.include "$S/arch/m68k/fpsp/Makefile.inc"
+.include "${M68K}/fpsp/Makefile.inc"
 
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
@@ -108,10 +109,12 @@ LINKFLAGS+=	-S
 
 %LOAD
 
-assym.h: $S/kern/genassym.sh ${HP300}/hp300/genassym.cf
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${HP300}/hp300/genassym.cf > assym.h.tmp && \
-	    mv -f assym.h.tmp assym.h
+assym.h: $S/kern/genassym.sh \
+	 ${M68K}/m68k/genassym.cf ${HP300}/hp300/genassym.cf
+	cat ${M68K}/m68k/genassym.cf ${HP300}/hp300/genassym.cf | \
+	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    > assym.h.tmp && \
+	mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
 	rm -f param.c
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index 58fbffbf709..ff8a42b2ca8 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mac68k,v 1.21 2001/07/15 13:10:48 assar Exp $
+#	$OpenBSD: Makefile.mac68k,v 1.22 2001/08/30 22:10:18 miod Exp $
 #	$NetBSD: Makefile.mac68k,v 1.53 1997/04/15 06:11:38 scottr Exp $
 
 # Makefile for OpenBSD
@@ -36,6 +36,7 @@ TOUCH?=	touch -f -c
 S!=	cd ../../../..; pwd
 .endif
 MAC68K=	$S/arch/mac68k
+M68K=	$S/arch/m68k
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dmac68k
@@ -66,7 +67,7 @@ LIBCOMPAT=${COMPATLIB_PROF}
 .endif
 
 ### for the Motorola 68040 Floating Point Software Product
-.include "$S/arch/m68k/fpsp/Makefile.inc"
+.include "${M68K}/fpsp/Makefile.inc"
 
 # compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
 # where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
@@ -115,9 +116,11 @@ LINKFLAGS+=	-S
 
 %LOAD
 
-assym.h: $S/kern/genassym.sh ${MAC68K}/mac68k/genassym.cf
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-	    < ${MAC68K}/mac68k/genassym.cf > assym.h.tmp && \
+assym.h: $S/kern/genassym.sh \
+	 ${M68K}/m68k/genassym.cf ${MAC68K}/mac68k/genassym.cf
+	cat ${M68K}/m68k/genassym.cf ${MAC68K}/mac68k/genassym.cf | \
+	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    > assym.h.tmp && \
 	mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index a95b4ed40c0..a004368af50 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.mvme68k,v 1.11 2001/07/15 13:10:49 assar Exp $
+#	$OpenBSD: Makefile.mvme68k,v 1.12 2001/08/30 22:10:18 miod Exp $
 
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -29,8 +29,11 @@ STRIP?=	strip
 COPTS?=	-O2
 
 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-MVME68K=../..
+.ifndef S
+S!=	cd ../../../..; pwd
+.endif
+MVME68K=$S/arch/mvme68k
+M68K=	$S/arch/m68k
 
 INCLUDES=	 -I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmvme68k
@@ -69,10 +72,10 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
 ### for the Motorola 68040 Floating Point Software Product
-.include "$S/arch/m68k/fpsp/Makefile.inc"
+.include "${M68K}/fpsp/Makefile.inc"
 
 ### for the Motorola 68060 Support Package
-.include "$S/arch/m68k/060sp/Makefile.inc"
+.include "${M68K}/060sp/Makefile.inc"
 
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
@@ -113,10 +116,12 @@ LINKFLAGS+=	-S
 
 %LOAD
 
-assym.h: $S/kern/genassym.sh ${MVME68K}/mvme68k/genassym.cf
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${MVME68K}/mvme68k/genassym.cf > assym.h.tmp && \
-	    mv -f assym.h.tmp assym.h
+assym.h: $S/kern/genassym.sh \
+	 ${M68K}/m68k/genassym.cf ${MVME68K}/mvme68k/genassym.cf
+	cat ${M68K}/m68k/genassym.cf ${MVME68K}/mvme68k/genassym.cf | \
+	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    > assym.h.tmp && \
+	mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
 	rm -f param.c
diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index 394ced80585..eed6b12e231 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sun3,v 1.26 2001/07/15 13:10:50 assar Exp $
+#	$OpenBSD: Makefile.sun3,v 1.27 2001/08/30 22:10:18 miod Exp $
 #	$NetBSD: Makefile.sun3,v 1.51 1996/09/09 21:07:08 mycroft Exp $
 
 # Makefile for OpenBSD
@@ -34,6 +34,7 @@ STRIP?=	strip
 S!=	cd ../../../..; pwd
 .endif
 SUN3=	$S/arch/sun3
+M68K=	$S/arch/m68k
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmc68020 -Dsun3
@@ -104,10 +105,12 @@ LINKFLAGS+=	-S
 
 %LOAD
 
-assym.h: $S/kern/genassym.sh ${SUN3}/sun3/genassym.cf
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${SUN3}/sun3/genassym.cf > assym.h.tmp && \
-	    mv -f assym.h.tmp assym.h
+assym.h: $S/kern/genassym.sh \
+	 ${M68K}/m68k/genassym.cf ${SUN3}/sun3/genassym.cf
+	cat ${M68K}/m68k/genassym.cf ${SUN3}/sun3/genassym.cf | \
+	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    > assym.h.tmp && \
+	mv -f assym.h.tmp assym.h
 
 param.c: $S/conf/param.c
 	rm -f param.c