diff options
author | Björn-Egil Dahlberg <[email protected]> | 2013-01-18 14:36:23 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2013-01-18 14:36:23 +0100 |
commit | b0e4f20f2abde9fc264995317966f373775e2b2b (patch) | |
tree | c2ded39c850156a1aafbc69fa1bc48ba08101922 /lib/tools/c_src | |
parent | 40e7a6da2054b9c430360bd5dd656b1d43f6c6ef (diff) | |
parent | fed9a8415fc77ed42bf9a94ea421eff4f62c5eb4 (diff) | |
download | otp-b0e4f20f2abde9fc264995317966f373775e2b2b.tar.gz otp-b0e4f20f2abde9fc264995317966f373775e2b2b.tar.bz2 otp-b0e4f20f2abde9fc264995317966f373775e2b2b.zip |
Merge branch 'nox/enable-silent-rules/OTP-10726'
* nox/enable-silent-rules/OTP-10726:
Implement ./otp_build configure --enable-silent-rules
Diffstat (limited to 'lib/tools/c_src')
-rw-r--r-- | lib/tools/c_src/Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in index 0382d3228d..aea5686ae9 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in @@ -17,6 +17,7 @@ # %CopyrightEnd% # +include $(ERL_TOP)/make/output.mk include $(ERL_TOP)/make/target.mk include $(ERL_TOP)/erts/include/internal/$(TARGET)/ethread.mk @@ -150,7 +151,7 @@ _create_dirs := $(shell mkdir -p $(CREATE_DIRS)) all: $(PROGS) $(DRIVERS) $(ERTS_LIB): - cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE) + $(make_verbose)cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE) docs: @@ -167,7 +168,7 @@ clean: # $(EMEM_OBJ_DIR)/%.o: %.c - $(CC) $(EMEM_CFLAGS) -o $@ -c $< + $(V_CC) $(EMEM_CFLAGS) -o $@ -c $< # # Driver targets @@ -178,7 +179,7 @@ $(EMEM_OBJ_DIR)/%.o: %.c # $(BIN_DIR)/emem$(TYPEMARKER)@EXEEXT@: $(EMEM_OBJS) $(ERTS_LIB) - $(PRE_LD) $(LD) $(EMEM_LDFLAGS) -o $@ $(EMEM_OBJS) $(EMEM_LIBS) + $(ld_verbose)$(PRE_LD) $(LD) $(EMEM_LDFLAGS) -o $@ $(EMEM_OBJS) $(EMEM_LIBS) # # Release targets @@ -221,7 +222,8 @@ SED_DEPEND=sed '$(SED_REPL_OBJ_DIR);$(SED_REPL_TT_DIR);$(SED_REPL_TARGET);$(SED_ DEPEND_MK=depend.mk dep depend: - @echo "Generating dependency file $(DEPEND_MK)..." + [ $(v_p) == 0 ] && echo " GEN "$(DEPEND_MK) + $(V_colon)@echo "Generating dependency file $(DEPEND_MK)..." @echo "# Generated dependency rules." > $(DEPEND_MK); @echo "# Do *not* edit this file; instead, run 'make depend'." \ >> $(DEPEND_MK); |