From 243bde6fb3eb46fcd7f0509f953bc5f567457c28 Mon Sep 17 00:00:00 2001 From: Robert Moore Date: Thu, 9 Mar 2017 13:41:18 -0800 Subject: [PATCH] Reduce verbosity of the standard makefiles Eliminate output of compile switches, etc. for every compiled file. Cleans up output. Switches are almost always the same anyway, --- generate/unix/Makefile.rules | 8 ++++--- generate/unix/iasl/Makefile | 45 ++++++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/generate/unix/Makefile.rules b/generate/unix/Makefile.rules index b9aa9a9c3..339e61d18 100644 --- a/generate/unix/Makefile.rules +++ b/generate/unix/Makefile.rules @@ -11,14 +11,16 @@ $(FINAL_PROG) : $(PROG) $(COPYPROG) $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS) - $(LINKPROG) + @echo "Link" $(PROG) + @$(LINKPROG) $(RENAMEPROG) $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILEOBJ) + @echo $(PROG) $< + @$(COMPILEOBJ) clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC) + @rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC) install : $(INSTALLPROG) diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile index aa6e42940..91bb82ed1 100644 --- a/generate/unix/iasl/Makefile +++ b/generate/unix/iasl/Makefile @@ -277,13 +277,15 @@ CFLAGS += \ include ../Makefile.rules # -# Function to safely execute yacc +# Function to safely execute yacc: +# Generate the output files to a temporary directory, +# move the file to $(OBJDIR), and discard the directory. # safe_yacc = \ _d=`mktemp -d $(OBJDIR)/$(1).XXXXXX` &&\ cd $$_d &&\ $(YACC) $(YFLAGS) -v -d -p$(1) $(abspath $(2)) &&\ - cd - &&\ + cd - > /dev/null;\ mv $$_d/y.tab$(suffix $(3)) $(3);\ _r=$$?;\ rm -fr $$_d;\ @@ -293,28 +295,35 @@ safe_yacc = \ # Macro processing for iASL .y files # $(OBJDIR)/aslcompiler.y : $(ASL_PARSER) - $(MACROPROC) $(MFLAGS) $(ASL_COMPILER)/aslparser.y > $@ + @echo $(MACROPROC) " Preprocess main iASL parser" + @$(MACROPROC) $(MFLAGS) $(ASL_COMPILER)/aslparser.y > $@ # # Parser and Lexer - intermediate C files # $(OBJDIR)/aslcompilerlex.c : $(ASL_LEXER) - $(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l + @echo $(LEX) " "$< + @$(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l $(OBJDIR)/aslcompilerparse.c $(OBJDIR)/aslcompiler.y.h : $(OBJDIR)/aslcompiler.y - $(call safe_yacc,AslCompiler,$<,$@) + @echo $(YACC) " "$< + @$(call safe_yacc,AslCompiler,$<,$@) $(OBJDIR)/dtparserlex.c : $(ASL_COMPILER)/dtparser.l $(OBJDIR)/dtparser.y.h - $(LEX) $(LFLAGS) -PDtParser -o$@ $< + @echo $(LEX) " "$< + @$(LEX) $(LFLAGS) -PDtParser -o$@ $< $(OBJDIR)/dtparserparse.c $(OBJDIR)/dtparser.y.h : $(ASL_COMPILER)/dtparser.y - $(call safe_yacc,DtParser,$<,$@) + @echo $(YACC) " "$< + @$(call safe_yacc,DtParser,$<,$@) $(OBJDIR)/prparserlex.c : $(ASL_COMPILER)/prparser.l $(OBJDIR)/prparser.y.h - $(LEX) $(LFLAGS) -PPrParser -o$@ $< + @echo $(LEX) " "$< + @$(LEX) $(LFLAGS) -PPrParser -o$@ $< $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparser.y - $(call safe_yacc,PrParser,$<,$@) + @echo $(YACC) " "$< + @$(call safe_yacc,PrParser,$<,$@) # # Parsers and Lexers - final object files @@ -323,19 +332,25 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse # by the utilities above and they are not necessarily ANSI C, etc. # $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @echo "Intermediate" $< + @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @echo "Intermediate" $< + @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @echo "Intermediate" $< + @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @echo "Intermediate" $< + @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @echo "Intermediate" $< + @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< + @echo "Intermediate" $< + @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<