diff options
| -rw-r--r-- | lib/diameter/doc/src/Makefile | 4 | ||||
| -rw-r--r-- | lib/eunit/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/wx/c_src/Makefile.in | 27 | ||||
| -rw-r--r-- | make/output.mk.in | 1 |
4 files changed, 20 insertions, 14 deletions
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile index bd2b6b103a..229812fd08 100644 --- a/lib/diameter/doc/src/Makefile +++ b/lib/diameter/doc/src/Makefile @@ -82,6 +82,7 @@ gifs: $(GIF_FILES:%=$(HTMLDIR)/%) man: $(MAN1_FILES) $(MAN3_FILES) $(MAN4_FILES) $(INDEX_TARGET): $(INDEX_SRC) $(APP_FILE) + $(gen_verbose) \ sed -e 's/%VSN%/$(VSN)/; \ s/%ERLANG_SITE%/www\.erlang\.se\//; \ s/%UP_ONE_LEVEL%/..\/..\/..\/doc\/index.html/; \ @@ -140,7 +141,10 @@ release_spec: depend.mk: depend.sed Makefile seealso.ent \ $(XML_REF_FILES) $(XML_CHAPTER_FILES) + $(gen_verbose) + $(V_at) \ sed -f seehere.sed seealso.ent > seehere.ent + $(V_at) \ (for f in $(XML_REF_FILES) $(XML_CHAPTER_FILES); do \ sed -f $< $$f | sed "s@%FILE%@`basename $$f .xml`@g"; \ done) \ diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile index e88e28df83..e6dab67363 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -95,7 +95,7 @@ info: realclean: clean $(EBIN)/%.$(EMULATOR):%.erl - erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $< + $(erlc_verbose)erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $< $(OBJECTS): $(PARSE_TRANSFORM_BIN) diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in index 1d17076d23..5507a74c14 100644 --- a/lib/wx/c_src/Makefile.in +++ b/lib/wx/c_src/Makefile.in @@ -46,6 +46,7 @@ HAVE_OPENGL = true OPENGL_F = gl_funcs egl_impl include $(ERL_TOP)/make/target.mk +include $(ERL_TOP)/make/output.mk include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk ERL_INCS= $(DED_INCLUDES) @@ -107,9 +108,9 @@ endif GL_LIBS = @GL_LIBS@ -CC_O = $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) +CC_O = $(V_CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) OBJC_CC_O = $(OBJC_CC) -c $(CFLAGS) $(OBJC_CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS) -CPP_O = $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) +CPP_O = $(V_CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS) $(COMMON_CFLAGS) # Targets @@ -138,36 +139,36 @@ $(GL_OBJECTS): $(GL_H) $(WX_OBJECTS): $(GENERATED_H) $(GENERAL_H) $(SYS_TYPE)/%.o: %.cpp - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(CPP_O) $< -o $@ $(SYS_TYPE)/%.o: %.c - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(CC_O) $< -o $@ $(SYS_TYPE)/wxe_ps_init.o: wxe_ps_init.c - mkdir -p $(SYS_TYPE) - $(OBJC_CC_O) $< -o $@ + $(V_at)mkdir -p $(SYS_TYPE) + $(cc_verbose)$(OBJC_CC_O) $< -o $@ $(SYS_TYPE)/%.o: gen/%.cpp - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(CPP_O) $< -o $@ $(SYS_TYPE)/%.o: gen/%.c - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(CC_O) $< -o $@ $(SYS_TYPE)/wxe_win32.$(RC_FILE_EXT): wxe_win32.rc - mkdir -p $(SYS_TYPE) + $(V_at)mkdir -p $(SYS_TYPE) $(RESCOMP) -o $@ $< $(TARGET_DIR)/wxe_driver$(SO_EXT): $(WX_OBJECTS) - mkdir -p $(TARGET_DIR) - $(LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@ + $(V_at)mkdir -p $(TARGET_DIR) + $(V_LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@ $(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS) - mkdir -p $(TARGET_DIR) - $(CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@ + $(V_at)mkdir -p $(TARGET_DIR) + $(V_CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@ # ---------------------------------------------------- diff --git a/make/output.mk.in b/make/output.mk.in index 938f878ebe..51d9401280 100644 --- a/make/output.mk.in +++ b/make/output.mk.in @@ -67,6 +67,7 @@ V_CC = $(cc_verbose)$(CC) cpp_verbose_0 = @echo " CPP "$@; cpp_verbose = $(cpp_verbose_$(V)) +V_CPP = $(cpp_verbose)$(CPP) # For the diameter compiler. dia_verbose_0 = @echo " DIA "$@; |