aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate Williams <nate@FreeBSD.org>1993-08-04 23:51:59 +0000
committerNate Williams <nate@FreeBSD.org>1993-08-04 23:51:59 +0000
commit4ff3cd9d3ddeda602fd8b7717b2a6e4445852c69 (patch)
tree4567cc93bfefacc1891e0704a851da19b0e2af78
parent501584c759761cfd317c5c6c51f1523b55667165 (diff)
downloadsrc-4ff3cd9d3ddeda602fd8b7717b2a6e4445852c69.tar.gz
src-4ff3cd9d3ddeda602fd8b7717b2a6e4445852c69.zip
Fix the problem where newvers gets called every time make is run on
the kernel.
Notes
Notes: svn path=/head/; revision=241
-rw-r--r--sys/conf/Makefile.i38625
-rw-r--r--sys/conf/Makefile.powerpc25
-rw-r--r--sys/i386/conf/Makefile.i38625
3 files changed, 12 insertions, 63 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 7eedfb83b988..5bd812203bd4 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -18,24 +18,7 @@
# -DTRACE compile in kernel tracing hooks
# -DQUOTA compile in file system quotas
#
-# PATCHES MAGIC LEVEL PATCH THAT GOT US HERE
-# -------------------- ----- ----------------------
-# CURRENT PATCH LEVEL: 3 00158
-# -------------------- ----- ----------------------
-#
-# 29 Jun 92 Chris G. Demetriou Fix vers.o for kernel profiling and
-# plain old link
-# 25 Mar 93 Sean Eric Fagan Add support for assembler source
-# 25 Apr 93 Bruce Evans Support for intr-0.0, and some fixes
-# Rodney W. Grimes Added depedencies for conf.o due to
-# all the new drivers. And to param.c
-# because there were missing.
-# 26 May 97 Rodney W. Grimes Remove extra SYSTEM_LD_TAIL
-# Redirect stderr from dbsym to null,
-# this is bad, but atleast I won't get
-# 100's of bug reports about the silly
-# warning from dbsym.
-#
+
TOUCH= touch -f -c
LD= /usr/bin/ld
CC= cc
@@ -47,7 +30,7 @@ I386= ../../i386
INCLUDES= -I. -I$S -I$S/sys
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX
ASFLAGS=
-CFLAGS= -O ${COPTS}
+CFLAGS= -O ${DEBUG} ${COPTS}
NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
@@ -118,7 +101,7 @@ genassym:
${I386}/i386/genassym.c -o genassym
depend: assym.s param.c
- sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c
+ sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
sh /usr/bin/mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${I386}/i386/genassym.c
links:
@@ -154,7 +137,7 @@ param.c: $S/conf/param.c \
param.o: param.c Makefile
${CC} -c ${CFLAGS} ${PARAM} param.c
-newvers:
+vers.o: ${SYSTEM_DEP}
sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
${CC} ${CFLAGS} -c vers.c
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 7eedfb83b988..5bd812203bd4 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -18,24 +18,7 @@
# -DTRACE compile in kernel tracing hooks
# -DQUOTA compile in file system quotas
#
-# PATCHES MAGIC LEVEL PATCH THAT GOT US HERE
-# -------------------- ----- ----------------------
-# CURRENT PATCH LEVEL: 3 00158
-# -------------------- ----- ----------------------
-#
-# 29 Jun 92 Chris G. Demetriou Fix vers.o for kernel profiling and
-# plain old link
-# 25 Mar 93 Sean Eric Fagan Add support for assembler source
-# 25 Apr 93 Bruce Evans Support for intr-0.0, and some fixes
-# Rodney W. Grimes Added depedencies for conf.o due to
-# all the new drivers. And to param.c
-# because there were missing.
-# 26 May 97 Rodney W. Grimes Remove extra SYSTEM_LD_TAIL
-# Redirect stderr from dbsym to null,
-# this is bad, but atleast I won't get
-# 100's of bug reports about the silly
-# warning from dbsym.
-#
+
TOUCH= touch -f -c
LD= /usr/bin/ld
CC= cc
@@ -47,7 +30,7 @@ I386= ../../i386
INCLUDES= -I. -I$S -I$S/sys
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX
ASFLAGS=
-CFLAGS= -O ${COPTS}
+CFLAGS= -O ${DEBUG} ${COPTS}
NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
@@ -118,7 +101,7 @@ genassym:
${I386}/i386/genassym.c -o genassym
depend: assym.s param.c
- sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c
+ sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
sh /usr/bin/mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${I386}/i386/genassym.c
links:
@@ -154,7 +137,7 @@ param.c: $S/conf/param.c \
param.o: param.c Makefile
${CC} -c ${CFLAGS} ${PARAM} param.c
-newvers:
+vers.o: ${SYSTEM_DEP}
sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
${CC} ${CFLAGS} -c vers.c
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 7eedfb83b988..5bd812203bd4 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -18,24 +18,7 @@
# -DTRACE compile in kernel tracing hooks
# -DQUOTA compile in file system quotas
#
-# PATCHES MAGIC LEVEL PATCH THAT GOT US HERE
-# -------------------- ----- ----------------------
-# CURRENT PATCH LEVEL: 3 00158
-# -------------------- ----- ----------------------
-#
-# 29 Jun 92 Chris G. Demetriou Fix vers.o for kernel profiling and
-# plain old link
-# 25 Mar 93 Sean Eric Fagan Add support for assembler source
-# 25 Apr 93 Bruce Evans Support for intr-0.0, and some fixes
-# Rodney W. Grimes Added depedencies for conf.o due to
-# all the new drivers. And to param.c
-# because there were missing.
-# 26 May 97 Rodney W. Grimes Remove extra SYSTEM_LD_TAIL
-# Redirect stderr from dbsym to null,
-# this is bad, but atleast I won't get
-# 100's of bug reports about the silly
-# warning from dbsym.
-#
+
TOUCH= touch -f -c
LD= /usr/bin/ld
CC= cc
@@ -47,7 +30,7 @@ I386= ../../i386
INCLUDES= -I. -I$S -I$S/sys
COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX
ASFLAGS=
-CFLAGS= -O ${COPTS}
+CFLAGS= -O ${DEBUG} ${COPTS}
NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
@@ -118,7 +101,7 @@ genassym:
${I386}/i386/genassym.c -o genassym
depend: assym.s param.c
- sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c
+ sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
sh /usr/bin/mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${I386}/i386/genassym.c
links:
@@ -154,7 +137,7 @@ param.c: $S/conf/param.c \
param.o: param.c Makefile
${CC} -c ${CFLAGS} ${PARAM} param.c
-newvers:
+vers.o: ${SYSTEM_DEP}
sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
${CC} ${CFLAGS} -c vers.c