From 87610a53a9a0fff6eb45d8a6171737563cc62d96 Mon Sep 17 00:00:00 2001 From: lukem Date: Fri, 18 Jul 2003 04:04:03 +0000 Subject: [PATCH] whitespace cleanup --- share/mk/bsd.dep.mk | 4 ++-- share/mk/bsd.hostprog.mk | 4 ++-- share/mk/bsd.kernobj.mk | 10 +++++----- share/mk/bsd.kmod.mk | 4 ++-- share/mk/bsd.lib.mk | 12 ++++++------ share/mk/bsd.obj.mk | 4 ++-- share/mk/sys.mk | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index dc33b4428b79..7c94e2a4e86b 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.dep.mk,v 1.45 2003/06/11 18:05:40 wiz Exp $ +# $NetBSD: bsd.dep.mk,v 1.46 2003/07/18 04:06:18 lukem Exp $ ##### Basic targets .PHONY: cleandepend @@ -60,7 +60,7 @@ SRCS_M = ${SRCS:M*.m} ${DPSRCS:M*.m} SRCS_X = ${SRCS:M*.C} ${DPSRCS:M*.C} \ ${SRCS:M*.cc} ${DPSRCS:M*.cc} \ ${SRCS:M*.cpp} ${DPSRCS:M*.cpp} \ - ${SRCS:M*.cxx} ${DPSRCS:M*.cxx} + ${SRCS:M*.cxx} ${DPSRCS:M*.cxx} .depend: ${SRCS} ${DPSRCS} \ ${SRCS_S:C/(.*)/\1.dep/g:S/^.dep$//g} \ diff --git a/share/mk/bsd.hostprog.mk b/share/mk/bsd.hostprog.mk index caddf105ab9c..26d42b335d9d 100644 --- a/share/mk/bsd.hostprog.mk +++ b/share/mk/bsd.hostprog.mk @@ -1,11 +1,11 @@ -# $NetBSD: bsd.hostprog.mk,v 1.29 2003/07/16 05:42:02 itojun Exp $ +# $NetBSD: bsd.hostprog.mk,v 1.30 2003/07/18 04:04:03 lukem Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .include .include ##### Basic targets -.PHONY: cleanprog +.PHONY: cleanprog clean: cleanprog ##### Default values diff --git a/share/mk/bsd.kernobj.mk b/share/mk/bsd.kernobj.mk index 132a4f630bc1..8be50b9c94db 100644 --- a/share/mk/bsd.kernobj.mk +++ b/share/mk/bsd.kernobj.mk @@ -1,20 +1,20 @@ -# $NetBSD: bsd.kernobj.mk,v 1.10 2003/01/06 17:40:19 lukem Exp $ +# $NetBSD: bsd.kernobj.mk,v 1.11 2003/07/18 04:04:03 lukem Exp $ # KERNSRCDIR Is the location of the top of the kernel src. # It defaults to `${NETBSDSRCDIR}/sys'. -# +# # KERNARCHDIR Is the location of the machine dependent kernel sources. # It defaults to `arch/${MACHINE}', but may be overridden # in case ${MACHINE} is not correct. -# +# # KERNCONFDIR Is where the configuration files for kernels are found. # It defaults to `${KERNSRCDIR}/${KERNARCHDIR}/conf'. -# +# # KERNOBJDIR Is the kernel build directory. The kernel GENERIC for # instance will be compiled in ${KERNOBJDIR}/GENERIC. # The default is the .OBJDIR of # `${KERNSRCDIR}/${KERNARCHDIR}/compile'. -# +# .include diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index e02963416274..124fdc27b6b9 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.kmod.mk,v 1.63 2003/05/07 22:36:06 fvdl Exp $ +# $NetBSD: bsd.kmod.mk,v 1.64 2003/07/18 04:04:03 lukem Exp $ .include @@ -60,7 +60,7 @@ ${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o .if exists($S/lkm/arch/${MACHINE_ARCH}/lkmhide.awk) ${OBJCOPY} \ `${NM} tmp.o | awk -f $S/lkm/arch/${MACHINE_ARCH}/lkmhide.awk` \ - tmp.o tmp1.o + tmp.o tmp1.o mv tmp1.o tmp.o .endif mv tmp.o ${.TARGET} diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 8546e36891a6..4b595f6badcb 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.221 2003/06/27 17:27:11 drochner Exp $ +# $NetBSD: bsd.lib.mk,v 1.222 2003/07/18 04:04:03 lukem Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -100,14 +100,14 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR} FPICFLAGS ?= -fPIC CPICFLAGS ?= -fPIC -DPIC -CPPPICFLAGS?= -DPIC +CPPPICFLAGS?= -DPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS ?= .elif (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && \ ${OBJECT_FMT} == "ELF" -# If you use -fPIC you need to define BIGPIC to turn on 32-bit +# If you use -fPIC you need to define BIGPIC to turn on 32-bit # relocations in asm code FPICFLAGS ?= -fPIC CPICFLAGS ?= -fPIC -DPIC @@ -119,7 +119,7 @@ APICFLAGS ?= -KPIC FPICFLAGS ?= -fPIC CPICFLAGS?= -fPIC -DPIC -CPPPICFLAGS?= -DPIC +CPPPICFLAGS?= -DPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS?= -k # XXX libraries often need the millicode functions in libgcc.a, @@ -133,7 +133,7 @@ SHLIB_SOVERSION=${SHLIB_FULLVERSION} SHLIB_SHFLAGS= FPICFLAGS ?= -fPIC CPICFLAGS?= -fPIC -DPIC -CPPPICFLAGS?= -DPIC +CPPPICFLAGS?= -DPIC CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS} APICFLAGS?= -k @@ -349,7 +349,7 @@ _LIBS+=llib-l${LIB}.ln || ${MKLINKLIB} != "no" ALLOBJS=${OBJS} ${POBJS} ${SOBJS} .else -ALLOBJS=${POBJS} ${SOBJS} +ALLOBJS=${POBJS} ${SOBJS} .endif .if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS) ALLOBJS+=${LOBJS} diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 4e73a4a0d014..e7116ee72d2e 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.obj.mk,v 1.40 2002/03/14 18:26:32 thorpej Exp $ +# $NetBSD: bsd.obj.mk,v 1.41 2003/07/18 04:06:18 lukem Exp $ .if !target(__initialized_obj__) __initialized_obj__: @@ -24,7 +24,7 @@ obj: @if [ ! -d ${MAKEOBJDIRPREFIX} ]; then \ echo "MAKEOBJDIRPREFIX ${MAKEOBJDIRPREFIX} does not exist, bailing..."; \ exit 1; \ - fi; + fi; .endif @if [ ! -d ${__objdir} ]; then \ mkdir -p ${__objdir}; \ diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 69be27ec6638..22ae23bf8784 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $NetBSD: sys.mk,v 1.74 2003/05/04 12:05:50 fvdl Exp $ +# $NetBSD: sys.mk,v 1.75 2003/07/18 04:04:04 lukem Exp $ # @(#)sys.mk 8.2 (Berkeley) 3/21/94 unix?= We run NetBSD. @@ -55,7 +55,7 @@ COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} CPP?= cpp -CPPFLAGS?= +CPPFLAGS?= FC?= f77 FFLAGS?= -O @@ -188,7 +188,7 @@ YACC.y?= ${YACC} ${YFLAGS} mv lex.yy.c ${.TARGET} .l.o: ${LEX.l} ${.IMPSRC} - ${COMPILE.c} -o ${.TARGET} lex.yy.c + ${COMPILE.c} -o ${.TARGET} lex.yy.c rm -f lex.yy.c # Yacc