From 84aac2738154d46006979d01e3dce512db465848 Mon Sep 17 00:00:00 2001 From: Hartmut Brandt Date: Mon, 11 Apr 2005 07:13:29 +0000 Subject: [PATCH] Make sure the only thing that follows .endif or .else is a comment. --- share/mk/bsd.files.mk | 4 ++-- share/mk/bsd.incs.mk | 4 ++-- share/mk/bsd.init.mk | 2 +- share/mk/bsd.lib.mk | 6 +++--- share/mk/bsd.nls.mk | 2 +- share/mk/bsd.obj.mk | 4 ++-- share/mk/bsd.own.mk | 2 +- share/mk/bsd.prog.mk | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index bf3a5df1111..240f958f1a9 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -60,10 +60,10 @@ _${group}INS: ${_${group}FILES} .endif .endif -.endif defined(${group}) && !empty(${group}) +.endif # defined(${group}) && !empty(${group}) .endfor -.endif !target(installfiles) +.endif # !target(installfiles) realinstall: installfiles .ORDER: beforeinstall installfiles diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index 615d8bb83cf..f3b99e3d8ac 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -59,7 +59,7 @@ _${group}INS: ${_${group}INCS} .endif .endif -.endif defined(${group}) && !empty(${group}) +.endif # defined(${group}) && !empty(${group}) .endfor .if defined(INCSLINKS) && !empty(INCSLINKS) @@ -74,7 +74,7 @@ installincludes: ln -fs $$l $$t; \ done; true .endif -.endif !target(installincludes) +.endif # !target(installincludes) realinstall: installincludes .ORDER: beforeinstall installincludes diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk index 13665c01484..72a6de0ef34 100644 --- a/share/mk/bsd.init.mk +++ b/share/mk/bsd.init.mk @@ -12,4 +12,4 @@ ____: .include .include .MAIN: all -.endif !target(____) +.endif # !target(____) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 1c33c5d753e..3bddd7e4103 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -166,7 +166,7 @@ ${LINTLIB}: ${LINTOBJS} ${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.endif !defined(INTERNALLIB) +.endif # !defined(INTERNALLIB) all: ${_LIBS} @@ -240,7 +240,7 @@ _libinstall: ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} .endif -.endif !defined(INTERNALLIB) +.endif # !defined(INTERNALLIB) .include .include @@ -308,7 +308,7 @@ clean: .if defined(WANT_LINT) && defined(LIB) && !empty(LIB) rm -f ${LINTOBJS} .endif -.endif !defined(INTERNALLIB) +.endif # !defined(INTERNALLIB) .if defined(_LIBS) && !empty(_LIBS) rm -f ${_LIBS} .endif diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk index f6fa3dbb0c9..237debea4ef 100644 --- a/share/mk/bsd.nls.mk +++ b/share/mk/bsd.nls.mk @@ -73,4 +73,4 @@ SYMLINKS+= ../${file:R}/${NLSNAME}.cat ${NLSDIR}/${dst}/${NLSNAME}.cat .endfor .endfor -.endif defined(NLS) && !empty(NLS) && !defined(NO_NLS) +.endif # defined(NLS) && !empty(NLS) && !defined(NO_NLS) diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index aacedec4e89..bd8f2aabc21 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -98,7 +98,7 @@ objlink: echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \ fi .endif -.endif !defined(NO_OBJ) +.endif # !defined(NO_OBJ) # # where would that obj directory be? @@ -130,4 +130,4 @@ cleandir: cleanobj .include -.endif !target(____) +.endif # !target(____) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index e2293fd73ba..ac03fda5ba1 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -165,4 +165,4 @@ STRIP?= -s COMPRESS_CMD?= gzip -cn COMPRESS_EXT?= .gz -.endif !target(____) +.endif # !target(____) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index f94c00cdc92..3b4d0922674 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -48,7 +48,7 @@ ${PROG}: ${OBJS} ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif -.else !defined(SRCS) +.else # !defined(SRCS) .if !target(${PROG}) .if defined(PROG_CXX) @@ -140,7 +140,7 @@ _proginstall: ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} .endif .endif -.endif !target(realinstall) +.endif # !target(realinstall) .if defined(SCRIPTS) && !empty(SCRIPTS) realinstall: _scriptsinstall