diff options
author | peter <peter@FreeBSD.org> | 1999-01-17 21:17:27 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-01-17 21:17:27 +0000 |
commit | 6aaa84a7711e97927dda4283b36fdfe05ddd2ff6 (patch) | |
tree | 6f1438e9bdd41686d8cb50c97c649b8a3ac1f944 /sys/i386/conf/Makefile.i386 | |
parent | 6978c62d293bc0aacdfa74ebd15c8d4ae066ad58 (diff) | |
download | FreeBSD-src-6aaa84a7711e97927dda4283b36fdfe05ddd2ff6.zip FreeBSD-src-6aaa84a7711e97927dda4283b36fdfe05ddd2ff6.tar.gz |
Use the gensetdefs that is now in /usr/bin, it's a superset of the
one in the kernel source, and that one is already used for modules.
I don't _think_ this will hurt releases, aout-to-elf, etc, but it is
possible. In all the cases I've looked at, config(8) has been
generated straight after a make world, so if /usr/sbin/config exists and
is the right version for the kernel, then we can pretty much count on
/usr/bin/gensetdefs being there too.
Diffstat (limited to 'sys/i386/conf/Makefile.i386')
-rw-r--r-- | sys/i386/conf/Makefile.i386 | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index e4e8fd30..0e2e591 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/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.133 1999/01/07 06:52:41 peter Exp $ +# $Id: Makefile.i386,v 1.134 1999/01/09 21:51:00 jdp Exp $ # # Makefile for FreeBSD # @@ -74,8 +74,8 @@ DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} $< DRIVER_S= ${CC} -c -x ${ASM_CFLAGS} $< PROFILE_C= ${CC} -c ${CFLAGS} $< -GEN_CFILES= ${I386}/i386/genassym.c ${I386}/i386/gensetdefs.c -# ${I386}/i386/setdef0.c and ${I386}/i386/setdef1.c are intentionally +GEN_CFILES= ${I386}/i386/genassym.c +# setdef0.c and setdef1.c are intentionally # omitted from SYSTEM_CFILES. They include setdefs.h, a header which # is generated from all of ${OBJS}. We don't want to have to compile # everything just to do a make depend. @@ -123,7 +123,7 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} clean: rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \ - kernel linterrs makelinks param.c setdefs.h \ + kernel linterrs makelinks param.c setdef[01].c setdefs.h \ symbols.exclude symbols.sort tags \ vers.c vnode_if.c vnode_if.h ${CLEAN} @@ -154,20 +154,14 @@ hack.So: Makefile rm -f hack.c .endif -setdef0.o: ${I386}/i386/setdef0.c setdefs.h +setdef0.o: setdef0.c setdefs.h ${NORMAL_C} -setdef1.o: ${I386}/i386/setdef1.c setdefs.h +setdef1.o: setdef1.c setdefs.h ${NORMAL_C} -setdefs.h: gensetdefs ${OBJS} - ./gensetdefs ${OBJS} >setdefs.h - -gensetdefs: gensetdefs.o - ${CC} ${GEN_CFLAGS} gensetdefs.o -o ${.TARGET} - -gensetdefs.o: ${I386}/i386/gensetdefs.c - ${CC} -c ${GEN_CFLAGS} ${I386}/i386/gensetdefs.c +setdef0.c setdef1.c setdefs.h: ${OBJS} + gensetdefs ${OBJS} # this rule stops ./assym.s in .depend from causing problems ./assym.s: assym.s @@ -181,7 +175,7 @@ genassym.o: ${I386}/i386/genassym.c genassym: genassym.o ${CC} ${GEN_CFLAGS} genassym.o -o ${.TARGET} -${SYSTEM_OBJS} genassym.o gensetdefs.o vers.o: opt_global.h +${SYSTEM_OBJS} genassym.o vers.o: 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} |