svn commit: r289735 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Thu Oct 22 04:47:54 UTC 2015
Author: bdrewery
Date: Thu Oct 22 04:47:52 2015
New Revision: 289735
URL: https://svnweb.freebsd.org/changeset/base/289735
Log:
Fix style. Namely use {} rather than ().
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.crunchgen.mk
Modified: head/share/mk/bsd.crunchgen.mk
==============================================================================
--- head/share/mk/bsd.crunchgen.mk Thu Oct 22 04:42:17 2015 (r289734)
+++ head/share/mk/bsd.crunchgen.mk Thu Oct 22 04:47:52 2015 (r289735)
@@ -13,14 +13,14 @@
# local architecture.
#
# Special options can be specified for individual programs
-# CRUNCH_SRCDIR_$(P): base source directory for program $(P)
-# CRUNCH_BUILDOPTS_$(P): additional build options for $(P)
-# CRUNCH_ALIAS_$(P): additional names to be used for $(P)
+# CRUNCH_SRCDIR_${P}: base source directory for program ${P}
+# CRUNCH_BUILDOPTS_${P}: additional build options for ${P}
+# CRUNCH_ALIAS_${P}: additional names to be used for ${P}
#
# By default, any name appearing in CRUNCH_PROGS or CRUNCH_ALIAS_${P}
# will be used to generate a hard link to the resulting binary.
# Specific links can be suppressed by setting
-# CRUNCH_SUPPRESS_LINK_$(NAME) to 1.
+# CRUNCH_SUPPRESS_LINK_${NAME} to 1.
#
# If CRUNCH_GENERATE_LINKS is set to no, no links will be generated.
#
@@ -31,101 +31,101 @@
# The following is pretty nearly a generic crunchgen-handling makefile
#
-CONF= $(PROG).conf
-OUTMK= $(PROG).mk
-OUTC= $(PROG).c
-OUTPUTS=$(OUTMK) $(OUTC) $(PROG).cache
+CONF= ${PROG}.conf
+OUTMK= ${PROG}.mk
+OUTC= ${PROG}.c
+OUTPUTS=${OUTMK} ${OUTC} ${PROG}.cache
CRUNCHOBJS= ${.OBJDIR}
-.if defined(MAKEOBJDIRPREFIX)
+.if defined{MAKEOBJDIRPREFIX}
CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR}
-.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
-CANONICALOBJDIR:=${MAKEOBJDIR}
+.elif defined{MAKEOBJDIR} && ${MAKEOBJDIR:M/*} != ""
+CANONICALOBJDIR:= ${MAKEOBJDIR}
.else
CANONICALOBJDIR:= /usr/obj${.CURDIR}
.endif
-CRUNCH_GENERATE_LINKS?= yes
+CRUNCH_GENERATE_LINKS?= yes
-CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h
+CLEANFILES+= ${CONF} *.o *.lo *.c *.mk *.cache *.a *.h
# Don't try to extract debug info from ${PROG}.
-MK_DEBUG_FILES=no
+MK_DEBUG_FILES= no
# Program names and their aliases contribute hardlinks to 'rescue' executable,
# except for those that get suppressed.
-.for D in $(CRUNCH_SRCDIRS)
-.for P in $(CRUNCH_PROGS_$(D))
+.for D in ${CRUNCH_SRCDIRS}
+.for P in ${CRUNCH_PROGS_${D}}
.ifdef CRUNCH_SRCDIR_${P}
-$(OUTPUTS): $(CRUNCH_SRCDIR_${P})/Makefile
+${OUTPUTS}: ${CRUNCH_SRCDIR_${P}}/Makefile
.else
-$(OUTPUTS): $(.CURDIR)/../../$(D)/$(P)/Makefile
+${OUTPUTS}: ${.CURDIR}/../../${D}/${P}/Makefile
.endif
.if ${CRUNCH_GENERATE_LINKS} == "yes"
.ifndef CRUNCH_SUPPRESS_LINK_${P}
-LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(P)
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${P}
.endif
-.for A in $(CRUNCH_ALIAS_$(P))
+.for A in ${CRUNCH_ALIAS_${P}}
.ifndef CRUNCH_SUPPRESS_LINK_${A}
-LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(A)
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${A}
.endif
.endfor
.endif
.endfor
.endfor
-all: $(PROG)
-exe: $(PROG)
+all: ${PROG}
+exe: ${PROG}
-$(CONF): Makefile
- echo \# Auto-generated, do not edit >$(.TARGET)
+${CONF}: Makefile
+ echo \# Auto-generated, do not edit >${.TARGET}
.ifdef CRUNCH_BUILDOPTS
- echo buildopts $(CRUNCH_BUILDOPTS) >>$(.TARGET)
+ echo buildopts ${CRUNCH_BUILDOPTS} >>${.TARGET}
.endif
.ifdef CRUNCH_LIBS
- echo libs $(CRUNCH_LIBS) >>$(.TARGET)
+ echo libs ${CRUNCH_LIBS} >>${.TARGET}
.endif
.ifdef CRUNCH_SHLIBS
- echo libs_so $(CRUNCH_SHLIBS) >>$(.TARGET)
+ echo libs_so ${CRUNCH_SHLIBS} >>${.TARGET}
.endif
-.for D in $(CRUNCH_SRCDIRS)
-.for P in $(CRUNCH_PROGS_$(D))
- echo progs $(P) >>$(.TARGET)
+.for D in ${CRUNCH_SRCDIRS}
+.for P in ${CRUNCH_PROGS_${D}}
+ echo progs ${P} >>${.TARGET}
.ifdef CRUNCH_SRCDIR_${P}
- echo special $(P) srcdir $(CRUNCH_SRCDIR_${P}) >>$(.TARGET)
+ echo special ${P} srcdir ${CRUNCH_SRCDIR_${P}} >>${.TARGET}
.else
- echo special $(P) srcdir $(.CURDIR)/../../$(D)/$(P) >>$(.TARGET)
+ echo special ${P} srcdir ${.CURDIR}/../../${D}/${P} >>${.TARGET}
.endif
.ifdef CRUNCH_BUILDOPTS_${P}
- echo special $(P) buildopts DIRPRFX=${DIRPRFX}${P}/ \
- $(CRUNCH_BUILDOPTS_${P}) >>$(.TARGET)
+ echo special ${P} buildopts DIRPRFX=${DIRPRFX}${P}/ \
+ ${CRUNCH_BUILDOPTS_${P}} >>${.TARGET}
.else
- echo special $(P) buildopts DIRPRFX=${DIRPRFX}${P}/ >>$(.TARGET)
+ echo special ${P} buildopts DIRPRFX=${DIRPRFX}${P}/ >>${.TARGET}
.endif
-.for A in $(CRUNCH_ALIAS_$(P))
- echo ln $(P) $(A) >>$(.TARGET)
+.for A in ${CRUNCH_ALIAS_${P}}
+ echo ln ${P} ${A} >>${.TARGET}
.endfor
.endfor
.endfor
CRUNCHGEN?= crunchgen
CRUNCHENV?= MK_TESTS=no
-.ORDER: $(OUTPUTS) objs
-$(OUTPUTS): $(CONF) .META
- MAKE=${MAKE} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${CRUNCHGEN} -fq -m $(OUTMK) \
- -c $(OUTC) $(CONF)
+.ORDER: ${OUTPUTS} objs
+${OUTPUTS}: ${CONF} .META
+ MAKE=${MAKE} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${CRUNCHGEN} -fq \
+ -m ${OUTMK} -c ${OUTC} ${CONF}
# These 2 targets cannot use .MAKE since they depend on the generated
# ${OUTMK} above.
-$(PROG): $(OUTPUTS) objs
- ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f $(OUTMK) exe
+${PROG}: ${OUTPUTS} objs
+ ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f ${OUTMK} exe
-objs: $(OUTMK)
- ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f $(OUTMK) objs
+objs: ${OUTMK}
+ ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f ${OUTMK} objs
# <sigh> Someone should replace the bin/csh and bin/sh build-tools with
# shell scripts so we can remove this nonsense.
-.for _tool in $(CRUNCH_BUILDTOOLS)
+.for _tool in ${CRUNCH_BUILDTOOLS}
build-tools-${_tool}:
- ${_+_}cd $(.CURDIR)/../../${_tool}; \
+ ${_+_}cd ${.CURDIR}/../../${_tool}; \
${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} obj; \
${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools
build-tools: build-tools-${_tool}
@@ -136,10 +136,10 @@ build-tools: build-tools-${_tool}
# get that to cooperate with bsd.prog.mk. Besides, many of the standard
# targets should NOT be propagated into the components.
.for __target in clean cleandepend cleandir obj objlink
-.for D in $(CRUNCH_SRCDIRS)
-.for P in $(CRUNCH_PROGS_$(D))
+.for D in ${CRUNCH_SRCDIRS}
+.for P in ${CRUNCH_PROGS_${D}}
.ifdef CRUNCH_SRCDIR_${P}
-__dir= ${CRUNCH_SRCDIR_$(P)}
+__dir= ${CRUNCH_SRCDIR_${P}}
.else
__dir= ${.CURDIR}/../../${D}/${P}
.endif
@@ -154,6 +154,7 @@ ${__target}: ${__target}_crunchdir_${P}
clean:
rm -f ${CLEANFILES}
- ${_+_}if [ -e ${.OBJDIR}/$(OUTMK) ]; then \
- ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f $(OUTMK) clean; \
+ ${_+_}if [ -e ${.OBJDIR}/${OUTMK} ]; then \
+ ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} \
+ -f ${OUTMK} clean; \
fi
More information about the svn-src-head
mailing list