diff options
| -rw-r--r-- | sys/conf/Makefile.pc98 | 24 | ||||
| -rw-r--r-- | sys/pc98/conf/Makefile.pc98 | 24 |
2 files changed, 18 insertions, 30 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 527d6fa..8331283 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.49 1999/01/08 15:59:41 kato Exp $ +# $Id: Makefile.pc98,v 1.50 1999/01/09 21:51:00 jdp Exp $ # # Makefile for FreeBSD # @@ -77,8 +77,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. @@ -126,7 +126,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} @@ -157,20 +157,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 @@ -185,7 +179,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} diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98 index 527d6fa..8331283 100644 --- a/sys/pc98/conf/Makefile.pc98 +++ b/sys/pc98/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.49 1999/01/08 15:59:41 kato Exp $ +# $Id: Makefile.pc98,v 1.50 1999/01/09 21:51:00 jdp Exp $ # # Makefile for FreeBSD # @@ -77,8 +77,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. @@ -126,7 +126,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} @@ -157,20 +157,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 @@ -185,7 +179,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} |
