diff options
-rw-r--r-- | sys/arch/alpha/conf/Makefile.alpha | 4 | ||||
-rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 4 | ||||
-rw-r--r-- | sys/arch/armish/conf/Makefile.armish | 4 | ||||
-rw-r--r-- | sys/arch/beagle/conf/Makefile.beagle | 4 | ||||
-rw-r--r-- | sys/arch/gumstix/conf/Makefile.gumstix | 4 | ||||
-rw-r--r-- | sys/arch/hp300/conf/Makefile.hp300 | 8 | ||||
-rw-r--r-- | sys/arch/hppa/conf/Makefile.hppa | 8 | ||||
-rw-r--r-- | sys/arch/hppa64/conf/Makefile.hppa64 | 8 | ||||
-rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 4 | ||||
-rw-r--r-- | sys/arch/landisk/conf/Makefile.landisk | 4 | ||||
-rw-r--r-- | sys/arch/mac68k/conf/Makefile.mac68k | 7 | ||||
-rw-r--r-- | sys/arch/macppc/conf/Makefile.macppc | 4 | ||||
-rw-r--r-- | sys/arch/moko/conf/Makefile.moko | 4 | ||||
-rw-r--r-- | sys/arch/mvme68k/conf/Makefile.mvme68k | 4 | ||||
-rw-r--r-- | sys/arch/mvmeppc/conf/Makefile.mvmeppc | 4 | ||||
-rw-r--r-- | sys/arch/palm/conf/Makefile.palm | 4 | ||||
-rw-r--r-- | sys/arch/sgi/conf/Makefile.sgi | 4 | ||||
-rw-r--r-- | sys/arch/socppc/conf/Makefile.socppc | 4 | ||||
-rw-r--r-- | sys/arch/vax/conf/Makefile.vax | 4 | ||||
-rw-r--r-- | sys/arch/zaurus/conf/Makefile.zaurus | 4 |
20 files changed, 53 insertions, 42 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index dd3f07d3fc2..35905bdd7aa 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.63 2010/05/24 14:59:14 deraadt Exp $ +# $OpenBSD: Makefile.alpha,v 1.64 2010/05/24 17:49:36 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -140,7 +140,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 9e3c00e822d..f47d9f66cef 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.36 2010/05/24 14:59:15 deraadt Exp $ +# $OpenBSD: Makefile.amd64,v 1.37 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -144,7 +144,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index b5ac247f546..abca893018e 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.27 2010/05/24 14:59:15 deraadt Exp $ +# $OpenBSD: Makefile.armish,v 1.28 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -150,7 +150,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle index ce31fcbbd82..2a71f5a0aab 100644 --- a/sys/arch/beagle/conf/Makefile.beagle +++ b/sys/arch/beagle/conf/Makefile.beagle @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.beagle,v 1.22 2010/05/24 14:59:15 deraadt Exp $ +# $OpenBSD: Makefile.beagle,v 1.23 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -147,7 +147,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix index 807e33a48d8..7573ea80709 100644 --- a/sys/arch/gumstix/conf/Makefile.gumstix +++ b/sys/arch/gumstix/conf/Makefile.gumstix @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.gumstix,v 1.20 2010/05/24 14:59:15 deraadt Exp $ +# $OpenBSD: Makefile.gumstix,v 1.21 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -147,7 +147,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index de4b186a236..68d81787d24 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.62 2010/05/24 14:59:15 deraadt Exp $ +# $OpenBSD: Makefile.hp300,v 1.63 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -177,9 +177,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} - -if test -n "${SFILES}"; then \ - ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ - fi +.if !empty(SFILES) + ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index f8991d8dc4b..37bfe1b93d1 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.52 2010/05/24 14:59:15 deraadt Exp $ +# $OpenBSD: Makefile.hppa,v 1.53 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -161,9 +161,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} - -if test -n "${SFILES}"; then \ - ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ - fi +.if !empty(SFILES) + ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index ad1ef3d5cc9..2b649a10e24 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.26 2010/05/24 14:59:15 deraadt Exp $ +# $OpenBSD: Makefile.hppa64,v 1.27 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -142,9 +142,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} - -if test -n "${SFILES}"; then \ - ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ - fi +.if !empty(SFILES) + ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index de0099fb9ed..f704ce64ae0 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.69 2010/05/24 17:43:33 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.70 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -147,7 +147,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index a24f9849985..0b5b9da568d 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.29 2010/05/24 14:59:15 deraadt Exp $ +# $OpenBSD: Makefile.landisk,v 1.30 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -140,7 +140,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index 1cfd8bc1010..fc34835a62e 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.59 2010/05/24 17:36:52 deraadt Exp $ +# $OpenBSD: Makefile.mac68k,v 1.60 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -142,10 +142,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - -if test -n "${SFILES}"; then \ - ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ - fi +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index 968650e98ef..2c1e6f2628b 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.49 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.macppc,v 1.50 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -140,7 +140,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko index 311b0b495b2..abc81be7ea7 100644 --- a/sys/arch/moko/conf/Makefile.moko +++ b/sys/arch/moko/conf/Makefile.moko @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.moko,v 1.20 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.moko,v 1.21 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -147,7 +147,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index 1b34b8582e2..6a611244c6b 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.50 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.51 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -143,7 +143,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index 6bc1033c257..9e10b3302da 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.46 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.47 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -140,7 +140,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm index 8ac86143ae0..51b15b0dfb2 100644 --- a/sys/arch/palm/conf/Makefile.palm +++ b/sys/arch/palm/conf/Makefile.palm @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.palm,v 1.17 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.palm,v 1.18 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -147,7 +147,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index 3c37dd5ea60..e9f73116bf1 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.41 2010/05/24 17:40:33 deraadt Exp $ +# $OpenBSD: Makefile.sgi,v 1.42 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -154,7 +154,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc index af2547b2df4..76ddb1ec224 100644 --- a/sys/arch/socppc/conf/Makefile.socppc +++ b/sys/arch/socppc/conf/Makefile.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.socppc,v 1.20 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.socppc,v 1.21 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -140,7 +140,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index aacbab50ebf..1d18570ebca 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.vax,v 1.48 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.vax,v 1.49 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -141,7 +141,9 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/intvec.s ${_machdir}/${_mach}/subr.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} +.endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index 586cd29957c..ee3f841bf64 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.30 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.zaurus,v 1.31 2010/05/24 17:49:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -147,7 +147,7 @@ depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -.if ${SFILES} != "" +.if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ |