Makefiles: Update to improve portability.

1) Use $(MAKE) instead of naked make.
2) Consistently use braces instead of parentheses.
Jung-uk Kim <jkim@FreeBSD.org>
This commit is contained in:
Robert Moore 2013-06-18 12:34:01 -07:00
parent d43e189699
commit 88982558e5
2 changed files with 15 additions and 15 deletions

View File

@ -12,11 +12,11 @@ HARDWARE_NAME := $(shell uname -m)
# Main rule will only generate versions that are appropriate for the running
# OS, either 64-bit or 32-bit.
#
all: ${PROGS}
${PROGS}: FORCE
all: $(PROGS)
$(PROGS): FORCE
@cd $(BUILD_DIRECTORY_PATH)/$@; \
mkdir -p obj; \
make || exit "$$?"; \
$(MAKE) || exit "$$?"; \
if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
echo "64-bit version of $@:"; \
else \
@ -30,12 +30,12 @@ ${PROGS}: FORCE
# in the local bin directory
#
clean: FORCE
@for toolname in ${PROGS}; do \
@for toolname in $(PROGS); do \
(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
if [ -d "obj" ] ; then \
echo "Removing $$toolname:"; \
pwd; \
make clean; \
$(MAKE) clean; \
rmdir obj; \
echo ""; \
fi; \
@ -46,12 +46,12 @@ clean: FORCE
# Very clean removes all executables and the local bin directory
#
veryclean: FORCE
@for toolname in ${PROGS}; do \
@for toolname in $(PROGS); do \
(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
if [ -d "obj" ] ; then \
echo "Removing $$toolname:"; \
pwd; \
make clean; \
$(MAKE) clean; \
rmdir obj; \
echo ""; \
fi; \
@ -68,10 +68,10 @@ veryclean: FORCE
# Install all tools, either 32-bit or 64-bit as appropriate for the host OS
#
install: FORCE
@for toolname in ${PROGS}; do \
@for toolname in $(PROGS); do \
(cd $(BUILD_DIRECTORY_PATH)/$$toolname; \
pwd; \
make PROG=$$toolname install; \
$(MAKE) PROG=$$toolname install; \
if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \
echo "Installed 64-bit version of $$toolname"; \
else \

View File

@ -238,22 +238,22 @@ include ../Makefile.rules
# Parser and Lexer - intermediate C files
#
$(OBJDIR)/aslcompilerlex.c : $(ASL_COMPILER)/aslcompiler.l $(ASL_COMPILER)/aslsupport.l
${LEX} ${LFLAGS} -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l
$(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l
$(OBJDIR)/aslcompilerparse.c $(OBJDIR)/aslcompilerparse.h : $(ASL_COMPILER)/aslcompiler.y
${YACC} ${YFLAGS} -pAslCompiler -o$@ $?
$(YACC) $(YFLAGS) -pAslCompiler -o$@ $?
$(OBJDIR)/dtparserlex.c : $(ASL_COMPILER)/dtparser.l
${LEX} ${LFLAGS} -PDtParser -o$@ $?
$(LEX) $(LFLAGS) -PDtParser -o$@ $?
$(OBJDIR)/dtparserparse.c $(OBJDIR)/dtparserparse.h : $(ASL_COMPILER)/dtparser.y
${YACC} ${YFLAGS} -pDtParser -o$@ $?
$(YACC) $(YFLAGS) -pDtParser -o$@ $?
$(OBJDIR)/prparserlex.c : $(ASL_COMPILER)/prparser.l
${LEX} ${LFLAGS} -PPrParser -o$@ $?
$(LEX) $(LFLAGS) -PPrParser -o$@ $?
$(OBJDIR)/prparserparse.c $(OBJDIR)/prparserparse.h : $(ASL_COMPILER)/prparser.y
${YACC} ${YFLAGS} -pPrParser -o$@ $?
$(YACC) $(YFLAGS) -pPrParser -o$@ $?
#