diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-03-24 08:44:28 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-03-24 08:44:28 +0000 |
| commit | 483cbcc1ebaff6abdeb9b83b3d1d4a3aa2763a37 (patch) | |
| tree | 7062b64556a6da336ecae9f516e6824ba439e29e /sys/conf | |
| parent | 02880f27f45a75e88494a7fc5e4711c138d58458 (diff) | |
| download | src-483cbcc1ebaff6abdeb9b83b3d1d4a3aa2763a37.tar.gz src-483cbcc1ebaff6abdeb9b83b3d1d4a3aa2763a37.zip | |
Restore the careful preservation of .depend (rev 1.78 of Makefile.i386)
that I removed in my last commit dealing with `make depend' bogons.
This commit has some races, but hopefully they are too short to matter.
Unfortuneatly, neither .newdep nor .olddep is removed by `make clean'.
Submitted by: bde
Notes
Notes:
svn path=/head/; revision=74742
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.alpha | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.i386 | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.ia64 | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.pc98 | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 6 |
5 files changed, 20 insertions, 10 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 26a47048f08a..37f7897bc69b 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -243,18 +243,20 @@ __reml.S: $S/$M/$M/divrem.m4 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h kernel-depend: - rm -f .depend + rm -f .olddep + if [ -f .depend ]; then mv .depend .olddep; fi ${MAKE} _kernel-depend _kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/} + if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} env MKDEP_CPP="${CC} -E" \ mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES} rm -f .depend - mv -f .newdep .depend + mv .newdep .depend kernel-cleandepend: rm -f .depend diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 1af9e6166351..2fa7b9a7db76 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -203,18 +203,20 @@ genassym.o: $S/$M/$M/genassym.c ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h kernel-depend: - rm -f .depend + rm -f .olddep + if [ -f .depend ]; then mv .depend .olddep; fi ${MAKE} _kernel-depend _kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/} + if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} env MKDEP_CPP="${CC} -E" \ mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES} rm -f .depend - mv -f .newdep .depend + mv .newdep .depend kernel-cleandepend: rm -f .depend diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64 index 617c7eb29afe..eccf6c025f48 100644 --- a/sys/conf/Makefile.ia64 +++ b/sys/conf/Makefile.ia64 @@ -207,18 +207,20 @@ genassym.o: $S/$M/$M/genassym.c ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h kernel-depend: - rm -f .depend + rm -f .olddep + if [ -f .depend ]; then mv .depend .olddep; fi ${MAKE} _kernel-depend _kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/} + if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep CC="${CC}" mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} env MKDEP_CPP="${CC} -E" \ mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES} rm -f .depend - mv -f .newdep .depend + mv .newdep .depend kernel-cleandepend: rm -f .depend diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index a4b2fd3e020b..69a7d3788717 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -206,18 +206,20 @@ genassym.o: $S/$M/$M/genassym.c ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h kernel-depend: - rm -f .depend + rm -f .olddep + if [ -f .depend ]; then mv .depend .olddep; fi ${MAKE} _kernel-depend _kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/} + if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} env MKDEP_CPP="${CC} -E" \ mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES} rm -f .depend - mv -f .newdep .depend + mv .newdep .depend kernel-cleandepend: rm -f .depend diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 1af9e6166351..2fa7b9a7db76 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -203,18 +203,20 @@ genassym.o: $S/$M/$M/genassym.c ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h kernel-depend: - rm -f .depend + rm -f .olddep + if [ -f .depend ]; then mv .depend .olddep; fi ${MAKE} _kernel-depend _kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \ ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/} + if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} env MKDEP_CPP="${CC} -E" \ mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES} rm -f .depend - mv -f .newdep .depend + mv .newdep .depend kernel-cleandepend: rm -f .depend |