diff options
27 files changed, 56 insertions, 60 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 67be903b2b2..802683b0327 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.46 2009/09/24 19:51:32 miod Exp $ +# $OpenBSD: Makefile.alpha,v 1.47 2009/10/19 19:46:56 guenther Exp $ # $NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $ # Makefile for OpenBSD @@ -114,7 +114,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 94e4e35ab24..7b0b594dccf 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.19 2009/08/13 13:35:54 weingart Exp $ +# $OpenBSD: Makefile.amd64,v 1.20 2009/10/19 19:46:56 guenther Exp $ # Makefile for OpenBSD # @@ -127,7 +127,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index dd6eedb0f6c..52e7922d47f 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.11 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.armish,v 1.12 2009/10/19 19:46:56 guenther Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -142,7 +142,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion index 6b41a389097..fdb21170b6b 100644 --- a/sys/arch/aviion/conf/Makefile.aviion +++ b/sys/arch/aviion/conf/Makefile.aviion @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.aviion,v 1.9 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.aviion,v 1.10 2009/10/19 19:46:56 guenther Exp $ # # Makefile for OpenBSD # @@ -128,7 +128,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle index d45eef3478d..b4ac7a41885 100644 --- a/sys/arch/beagle/conf/Makefile.beagle +++ b/sys/arch/beagle/conf/Makefile.beagle @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.beagle,v 1.3 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.beagle,v 1.4 2009/10/19 19:46:56 guenther Exp $ # Makefile for OpenBSD # @@ -138,7 +138,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix index 0aea374f3f6..ca663901ec7 100644 --- a/sys/arch/gumstix/conf/Makefile.gumstix +++ b/sys/arch/gumstix/conf/Makefile.gumstix @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.gumstix,v 1.3 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.gumstix,v 1.4 2009/10/19 19:46:56 guenther Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -140,7 +140,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index c4e560eae09..7e92db33ea3 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.46 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.hp300,v 1.47 2009/10/19 19:46:56 guenther Exp $ # $NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $ # Makefile for OpenBSD @@ -160,7 +160,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index 4c66591f8fe..80cd197d0d1 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.36 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.hppa,v 1.37 2009/10/19 19:46:56 guenther Exp $ # Makefile for OpenBSD # @@ -139,7 +139,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index 29894d638e5..54d12cb6264 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.10 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.hppa64,v 1.11 2009/10/19 19:46:56 guenther Exp $ # Makefile for OpenBSD # @@ -123,7 +123,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 25a5609b156..9afb79ee18e 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.53 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.i386,v 1.54 2009/10/19 19:46:56 guenther Exp $ # Makefile for OpenBSD # @@ -132,7 +132,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index 86b804ef8ec..cbc7c19194c 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.11 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.landisk,v 1.12 2009/10/19 19:46:56 guenther Exp $ # # Makefile for OpenBSD/landisk # @@ -129,7 +129,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k index a2d0cf53238..5debe861ffd 100644 --- a/sys/arch/luna88k/conf/Makefile.luna88k +++ b/sys/arch/luna88k/conf/Makefile.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.luna88k,v 1.15 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.luna88k,v 1.16 2009/10/19 19:46:56 guenther Exp $ # # Makefile for OpenBSD # @@ -124,7 +124,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index 8a9544c301f..007541fbab0 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.43 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.mac68k,v 1.44 2009/10/19 19:46:56 guenther Exp $ # $NetBSD: Makefile.mac68k,v 1.53 1997/04/15 06:11:38 scottr Exp $ # Makefile for OpenBSD @@ -131,7 +131,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index 721c713def3..2ce90047ed5 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.32 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.macppc,v 1.33 2009/10/19 19:46:56 guenther Exp $ # # Makefile for OpenBSD PowerPC # @@ -126,7 +126,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko index 90b878f491a..dd7500581b8 100644 --- a/sys/arch/moko/conf/Makefile.moko +++ b/sys/arch/moko/conf/Makefile.moko @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.moko,v 1.3 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.moko,v 1.4 2009/10/19 19:46:56 guenther Exp $ # Makefile for OpenBSD # @@ -139,7 +139,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index c227f1705ce..19e98c54124 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.35 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.36 2009/10/19 19:46:56 guenther Exp $ # This makefile is constructed from a machine description: # config machineid @@ -125,7 +125,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index 7bcdbfbf545..ccf692972fe 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.46 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.47 2009/10/19 19:46:56 guenther Exp $ # # Makefile for OpenBSD # @@ -127,7 +127,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index 3facc2dae59..0d4a5822772 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.30 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.31 2009/10/19 19:46:56 guenther Exp $ # # Makefile for OpenBSD PowerPC # @@ -126,7 +126,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm index 3bfb4d590c6..4561f6f23d8 100644 --- a/sys/arch/palm/conf/Makefile.palm +++ b/sys/arch/palm/conf/Makefile.palm @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.palm,v 1.1 2009/09/05 01:22:11 marex Exp $ +# $OpenBSD: Makefile.palm,v 1.2 2009/10/19 19:46:56 guenther Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -134,7 +134,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index 434ef5af0c1..61cfe503b18 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.24 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.sgi,v 1.25 2009/10/19 19:46:56 guenther Exp $ # Makefile for OpenBSD # @@ -108,10 +108,6 @@ SYSTEM_LD_TAIL+=; \ %LOAD -newvers: - sh $S/conf/newvers.sh - ${CC} $(CFLAGS) -c vers.c - clean:: rm -f eddep bsd bsd.gdb tags *.[io] [a-z]*.s \ [Ee]rrs linterrs makelinks assym.h ${DB_STRUCTINFO} @@ -154,9 +150,6 @@ links: tags: @echo "see $S/kern/Makefile for tags" -ioconf.o: ioconf.c - ${NORMAL_C} - param.c: $S/conf/param.c rm -f param.c cp $S/conf/param.c . @@ -167,7 +160,10 @@ param.o: param.c Makefile mcount.o: $S/lib/libkern/mcount.c Makefile ${NORMAL_C_NOP} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +ioconf.o: ioconf.c + ${NORMAL_C} + +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc index b13f33fb9be..18d32364e2d 100644 --- a/sys/arch/socppc/conf/Makefile.socppc +++ b/sys/arch/socppc/conf/Makefile.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.socppc,v 1.4 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.socppc,v 1.5 2009/10/19 19:46:56 guenther Exp $ # # Makefile for OpenBSD PowerPC # @@ -126,7 +126,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne index b18234ad9b4..2a74d08f2ac 100644 --- a/sys/arch/solbourne/conf/Makefile.solbourne +++ b/sys/arch/solbourne/conf/Makefile.solbourne @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.solbourne,v 1.11 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.solbourne,v 1.12 2009/10/19 19:46:56 guenther Exp $ # Makefile for OpenBSD # @@ -128,7 +128,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index 7f1674c93a5..2fd1fce6eb5 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.47 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.sparc,v 1.48 2009/10/19 19:46:56 guenther Exp $ # $NetBSD: Makefile.sparc,v 1.32.4.1 1996/06/12 20:26:32 pk Exp $ # Makefile for OpenBSD @@ -134,7 +134,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index b4e74c45847..23fe957d8fc 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -105,7 +105,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index 11e75ab8abd..c4c8dfba6e1 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.vax,v 1.34 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.vax,v 1.35 2009/10/19 19:46:57 guenther Exp $ # $NetBSD: Makefile.vax,v 1.49 1999/07/26 05:20:49 cgd Exp $ # Makefile for OpenBSD/vax @@ -140,7 +140,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index 47e655fe4ef..09e6af0f87b 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.14 2009/08/09 23:04:49 miod Exp $ +# $OpenBSD: Makefile.zaurus,v 1.15 2009/10/19 19:46:57 guenther Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -140,7 +140,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile ioconf.o: ioconf.c ${NORMAL_C} -newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 187febaf11b..7c51d4c78c8 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkmakefile.c,v 1.31 2008/08/14 10:18:34 espie Exp $ */ +/* $OpenBSD: mkmakefile.c,v 1.32 2009/10/19 19:46:57 guenther Exp $ */ /* $NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $ */ /* @@ -521,7 +521,7 @@ emitload(FILE *fp) if (fprintf(fp, "%s: ${SYSTEM_DEP} swap%s.o", nm, swname) < 0) return (1); if (first) { - if (fputs(" newvers", fp) < 0) + if (fputs(" vers.o", fp) < 0) return (1); first = 0; } |