d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create a special option file "opt_global.h" which is included by all

Browse Source 
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
This commit is contained in:
Peter Wemm 1997-04-27 20:01:47 +00:00
parent a29f300e80
commit d061973c76
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/conf/Makefile.i386
View File

@ -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

8
sys/conf/Makefile.powerpc
View File

@ -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

4
sys/conf/options.i386
View File

@ -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

8
sys/i386/conf/Makefile.i386
View File

@ -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

4
sys/i386/conf/options.i386
View File

@ -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