diff options
| author | peter <peter@FreeBSD.org> | 1997-04-27 20:01:47 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-04-27 20:01:47 +0000 |
| commit | 2055c18199eb54e6b588944bd956161c26f65516 (patch) | |
| tree | c84e0864c3e1e7215f4d15f47ca2000c0eaed11e /sys/conf | |
| parent | 6afbf203bd570424ecf3f9d9d9ced17f82c81adc (diff) | |
| download | FreeBSD-src-2055c18199eb54e6b588944bd956161c26f65516.zip FreeBSD-src-2055c18199eb54e6b588944bd956161c26f65516.tar.gz | |
Create a special option file "opt_global.h" which is included by all
source files via a 'cc -include opt_global.h ...' type arrangement.
This means we can untangle certain header files.
options.i386 has a placeholder until it has a real member so we can avoid
having to teach config about it just yet.
Reviewed by: bde
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.i386 | 8 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 8 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index d1cacbc..2718b5c 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.93 1997/02/22 09:31:39 peter Exp $ +# $Id: Makefile.i386,v 1.94 1997/04/22 06:55:21 jdp Exp $ # # Makefile for FreeBSD # @@ -34,7 +34,7 @@ INCLUDES+= -I$S/../include .else INCLUDES+= -I/usr/include .endif -COPTS= ${INCLUDES} ${IDENT} -DKERNEL +COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} LOAD_ADDRESS?= F0100000 .if defined(PROF) @@ -137,12 +137,14 @@ assym.s: genassym # Some of the defines that genassym outputs may well depend on the # value of kernel options. -genassym.o: ${I386}/i386/genassym.c Makefile +genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h ${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c genassym: genassym.o ${CC} ${CFLAGS} ${PARAM} genassym.o -o $@ +${OBJS}: opt_global.h + # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical. depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} rm -f .newdep diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index d1cacbc..2718b5c 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.93 1997/02/22 09:31:39 peter Exp $ +# $Id: Makefile.i386,v 1.94 1997/04/22 06:55:21 jdp Exp $ # # Makefile for FreeBSD # @@ -34,7 +34,7 @@ INCLUDES+= -I$S/../include .else INCLUDES+= -I/usr/include .endif -COPTS= ${INCLUDES} ${IDENT} -DKERNEL +COPTS= ${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} LOAD_ADDRESS?= F0100000 .if defined(PROF) @@ -137,12 +137,14 @@ assym.s: genassym # Some of the defines that genassym outputs may well depend on the # value of kernel options. -genassym.o: ${I386}/i386/genassym.c Makefile +genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h ${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c genassym: genassym.o ${CC} ${CFLAGS} ${PARAM} genassym.o -o $@ +${OBJS}: opt_global.h + # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical. depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} rm -f .newdep diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 57ba3ed..29d3f9e 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,6 @@ -# $Id: options.i386,v 1.39 1997/04/05 13:21:08 bde Exp $ +# $Id: options.i386,v 1.40 1997/04/26 11:44:59 peter Exp $ +XXXCreateMe opt_global.h + BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h |
