From aae396953af41d23e93ccea6afe209a4136261b0 Mon Sep 17 00:00:00 2001 From: n_hibma Date: Tue, 9 May 2000 10:39:38 +0000 Subject: [PATCH] Create a separate target for the 'modules'. Without this the modules are only rebuilt if the kernel has changed as well. While there make 'all' and 'modules' a PHONY target. --- sys/conf/Makefile.alpha | 5 +++++ sys/conf/Makefile.i386 | 6 ++++++ sys/conf/Makefile.powerpc | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 719a49e5ea91..7f7f2aa2985a 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -104,6 +104,7 @@ SYSTEM_DEP+= $S/conf/ldscript.$M %CLEAN +.PHONY: all modules all: ${KERNEL} .if !defined(DEBUG) @@ -119,7 +120,11 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o @echo linking ${.TARGET} ${SYSTEM_LD} ${SYSTEM_LD_TAIL} + .if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) +all: modules + +modules: @mkdir -p ${.CURDIR}/modules cd ${.CURDIR}/../../modules && env MAKEOBJDIRPREFIX=${.CURDIR}/modules ${MAKE} obj cd ${.CURDIR}/../../modules && ${MAKE} all diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 2fe7d1018da3..74ade06d8243 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -103,6 +103,8 @@ SYSTEM_DEP+= $S/conf/ldscript.$M %CLEAN +.PHONY: all modules + all: ${KERNEL} .if !defined(DEBUG) @@ -118,7 +120,11 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o @echo linking ${.TARGET} ${SYSTEM_LD} ${SYSTEM_LD_TAIL} + .if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) +all: modules + +modules: @mkdir -p ${.CURDIR}/modules cd ${.CURDIR}/../../modules && env MAKEOBJDIRPREFIX=${.CURDIR}/modules ${MAKE} obj cd ${.CURDIR}/../../modules && env MAKEOBJDIRPREFIX=${.CURDIR}/modules ${MAKE} all diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 2fe7d1018da3..74ade06d8243 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -103,6 +103,8 @@ SYSTEM_DEP+= $S/conf/ldscript.$M %CLEAN +.PHONY: all modules + all: ${KERNEL} .if !defined(DEBUG) @@ -118,7 +120,11 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o @echo linking ${.TARGET} ${SYSTEM_LD} ${SYSTEM_LD_TAIL} + .if !defined(NO_MODULES) && exists(${.CURDIR}/../../modules) +all: modules + +modules: @mkdir -p ${.CURDIR}/modules cd ${.CURDIR}/../../modules && env MAKEOBJDIRPREFIX=${.CURDIR}/modules ${MAKE} obj cd ${.CURDIR}/../../modules && env MAKEOBJDIRPREFIX=${.CURDIR}/modules ${MAKE} all