Date: Sat, 05 Dec 1998 00:17:51 -0700 From: Warner Losh <imp@village.org> To: Bruce Evans <bde@zeta.org.au> Cc: jkh@zippy.cdrom.com, cvs-all@FreeBSD.ORG, cvs-committers@FreeBSD.ORG Subject: Re: Requiring make depend (was: cvs commit: src/sys/sys bus.h bus_private.h conf.h devicestat.h module.h src/sys/kern bus_if.m device_if.m kern_con) Message-ID: <199812050717.AAA48277@harmony.village.org> In-Reply-To: Your message of "Sat, 05 Dec 1998 17:21:55 %2B1100." <199812050621.RAA21287@godzilla.zeta.org.au> References: <199812050621.RAA21287@godzilla.zeta.org.au>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <199812050621.RAA21287@godzilla.zeta.org.au> Bruce Evans writes:
: It breaks `make -jN', and is not hard to fix using the same methods as
: in application makefiles.
OK. I think that for small values of N that my patches didn't break
-j and that -j was already broken for huge values of N.
: First make all objects depend on all generated
: headers. The list of generated headers is in ${BEFORE_DEPEND} (provided
: the dependencies for `depend' are correct).
This is a much better way. I don't know why I tried to kludge it
before, as it is so obviously right I can't belive I missed it.
Here's a new version, with some changes from your review mail. I've
moved kern/subr_{rman,bus} to their proper alphabetical order. I've
removed some of the bogus dependency lines that I had inserted in the
past. I didn't remove the now likely bogus depenency line from
aic7xxxx, nor from others later in the file.
I've also not patches the Alpha's Makefile, but that should be very
simple :-)
Warner
Index: conf/files
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/sys/conf/files,v
retrieving revision 1.177
diff -u -r1.177 files
--- files 1998/12/04 18:01:22 1.177
+++ files 1998/12/05 07:14:27
@@ -13,11 +13,7 @@
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 @@
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_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/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
Index: i386/conf/Makefile.i386
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/sys/i386/conf/Makefile.i386,v
retrieving revision 1.129
diff -u -r1.129 Makefile.i386
--- Makefile.i386 1998/11/15 18:07:35 1.129
+++ Makefile.i386 1998/12/05 07:11:04
@@ -117,6 +117,8 @@
%CLEAN
+${SYSTEM_OBJS}: ${BEFORE_DEPEND}
+
clean:
rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \
makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199812050717.AAA48277>