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/edoc | |
| 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/edoc')
| -rw-r--r-- | lib/edoc/priv/Makefile | 7 | ||||
| -rw-r--r-- | lib/edoc/src/Makefile | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/edoc/priv/Makefile b/lib/edoc/priv/Makefile index 73c42c05eb..9873136201 100644 --- a/lib/edoc/priv/Makefile +++ b/lib/edoc/priv/Makefile @@ -27,8 +27,11 @@ GEN_SCRIPT_SRC = edoc_generate.src GEN_SCRIPT = edoc_generate PRIV_FILES = stylesheet.css erlang.png edoc.dtd -debug opt: - sed -e "s/%EDOC_VSN%/$(EDOC_VSN)/g" \ +debug opt: $(GEN_SCRIPT) + +$(GEN_SCRIPT): ../vsn.mk ../../xmerl/vsn.mk ../../syntax_tools/vsn.mk \ + $(GEN_SCRIPT_SRC) + $(vsn_verbose)sed -e "s/%EDOC_VSN%/$(EDOC_VSN)/g" \ -e "s/%XMERL_VSN%/$(XMERL_VSN)/g" \ -e "s/%SYNTAX_TOOLS_VSN%/$(SYNTAX_TOOLS_VSN)/g" \ $(GEN_SCRIPT_SRC) > $(GEN_SCRIPT) diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile index 72354ac711..4e5a4182da 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile @@ -67,17 +67,17 @@ distclean: clean realclean: clean $(EBIN)/%.$(EMULATOR):%.erl - erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $< + $(erlc_verbose)erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $< # ---------------------------------------------------- # Special Build Targets # ---------------------------------------------------- $(APP_TARGET): $(APP_SRC) ../vsn.mk - sed -e 's;%VSN%;$(VSN);' $< > $@ + $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - sed -e 's;%VSN%;$(VSN);' $< > $@ + $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ # ---------------------------------------------------- # Release Target |