diff options
author | imp <imp@FreeBSD.org> | 1998-12-07 22:36:54 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 1998-12-07 22:36:54 +0000 |
commit | 2cfcfef3a141c7b67148f1c4f6a90b53d8c90288 (patch) | |
tree | 5d15f8041da62f4a178af18a2fcaaa969d365dbc /sys | |
parent | 60d13c7a9dd18f720483338ebef03609492ca98c (diff) | |
download | FreeBSD-src-2cfcfef3a141c7b67148f1c4f6a90b53d8c90288.zip FreeBSD-src-2cfcfef3a141c7b67148f1c4f6a90b53d8c90288.tar.gz |
If there is no .depends file, use the standard ad-hoc way of ensuring
that the generated files are generated before any of the object files.
Also minor cleanup of dependencies in conf/files that I bogusly added
before.
This should fix the requirement that make depend be done starting from
a clean config directory. If you don't have a clean directory, make
depend is still required if you want the proper .o's to be recompiled.
Reviewed by: bde
Diffstat (limited to 'sys')
-rw-r--r-- | sys/alpha/conf/Makefile.alpha | 6 | ||||
-rw-r--r-- | sys/conf/Makefile.alpha | 6 | ||||
-rw-r--r-- | sys/conf/Makefile.i386 | 6 | ||||
-rw-r--r-- | sys/conf/Makefile.powerpc | 6 | ||||
-rw-r--r-- | sys/conf/files | 7 | ||||
-rw-r--r-- | sys/i386/conf/Makefile.i386 | 6 |
6 files changed, 27 insertions, 10 deletions
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha index 1dfd90d..edcb52e 100644 --- a/sys/alpha/conf/Makefile.alpha +++ b/sys/alpha/conf/Makefile.alpha @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $Id: Makefile.alpha,v 1.12 1998/11/15 18:07:35 dfr Exp $ +# $Id: Makefile.alpha,v 1.13 1998/11/18 23:51:17 dima Exp $ # # Makefile for FreeBSD # @@ -98,6 +98,10 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@ %CLEAN +.if !exists(.depend) +${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} +.endif + clean: rm -f *.o *.s eddep errs genassym gensetdefs kernel linterrs \ makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 1dfd90d..edcb52e 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $Id: Makefile.alpha,v 1.12 1998/11/15 18:07:35 dfr Exp $ +# $Id: Makefile.alpha,v 1.13 1998/11/18 23:51:17 dima Exp $ # # Makefile for FreeBSD # @@ -98,6 +98,10 @@ SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@ %CLEAN +.if !exists(.depend) +${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} +.endif + clean: rm -f *.o *.s eddep errs genassym gensetdefs kernel linterrs \ makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 39a24ee..ddf2f9b 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/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.128 1998/11/04 15:27:41 peter Exp $ +# $Id: Makefile.i386,v 1.129 1998/11/15 18:07:35 dfr Exp $ # # Makefile for FreeBSD # @@ -117,6 +117,10 @@ SYSTEM_DEP+= $S/i386/conf/kernel.script %CLEAN +.if !exists(.depend) +${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} +.endif + clean: rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \ makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 39a24ee..ddf2f9b 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -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.128 1998/11/04 15:27:41 peter Exp $ +# $Id: Makefile.i386,v 1.129 1998/11/15 18:07:35 dfr Exp $ # # Makefile for FreeBSD # @@ -117,6 +117,10 @@ SYSTEM_DEP+= $S/i386/conf/kernel.script %CLEAN +.if !exists(.depend) +${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} +.endif + clean: rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \ makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ diff --git a/sys/conf/files b/sys/conf/files index c67be78..d549c43 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -13,11 +13,7 @@ aic7xxx_{seq,reg}.h optional ahc device-driver \ no-obj no-implicit-rule before-depend \ clean "aic7xxx_seq.h aic7xxx_reg.h" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" -kern/subr_rman.c standard -kern/subr_bus.c standard \ - dependency "device_if.h bus_if.h" device_if.o standard \ - dependency "device_if.c" \ compile-with "${NORMAL_C}" \ no-implicit-rule local device_if.c standard \ @@ -31,7 +27,6 @@ device_if.h standard \ no-obj no-implicit-rule before-depend \ clean "device_if.h" bus_if.o standard \ - dependency "bus_if.c bus_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local bus_if.c standard \ @@ -252,6 +247,7 @@ kern/kern_timeout.c standard kern/kern_xxx.c standard kern/md5c.c standard kern/subr_autoconf.c standard +kern/subr_bus.c standard kern/subr_devstat.c standard kern/subr_diskslice.c standard kern/subr_dkbad.c standard @@ -264,6 +260,7 @@ kern/subr_xxx.c standard kern/sys_generic.c standard kern/sys_pipe.c standard kern/sys_process.c standard +kern/subr_rman.c standard kern/sys_socket.c standard kern/sysv_ipc.c standard kern/sysv_msg.c optional sysvmsg diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 39a24ee..ddf2f9b 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.128 1998/11/04 15:27:41 peter Exp $ +# $Id: Makefile.i386,v 1.129 1998/11/15 18:07:35 dfr Exp $ # # Makefile for FreeBSD # @@ -117,6 +117,10 @@ SYSTEM_DEP+= $S/i386/conf/kernel.script %CLEAN +.if !exists(.depend) +${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} +.endif + clean: rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \ makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ |