From 553987064dfa6ec917f9695b12d5c2b370ba8ea7 Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Fri, 20 Jul 2012 20:49:33 +0200 Subject: [PATCH] Simplify some make rules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A rule of type "a/%: a/%.in" will also match "a/b/%: a/b/%.in", so no need for the explicit examples/hooks rule. As for the man rules, they are identical and thus can be collapsed. We still have the problem that globally, not all our %.in to % transformations are identical; this is suboptimal and should be cleaned sometime⦠Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Guido Trotter <ultrotter@google.com> --- Makefile.am | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0d4cabd69..1bb2b5347 100644 --- a/Makefile.am +++ b/Makefile.am @@ -977,9 +977,6 @@ daemons/%:: daemons/%.in $(REPLACE_VARS_SED) doc/examples/%:: doc/examples/%.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ -doc/examples/hooks/%:: doc/examples/hooks/%.in $(REPLACE_VARS_SED) - sed -f $(REPLACE_VARS_SED) < $< > $@ - doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \ lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin \ $(GENERATED_FILES) @@ -1031,16 +1028,7 @@ man/%.html.in: man/%.gen man/footer.html $(PANDOC) -s -f rst -t html -A man/footer.html $< | \ sed -e 's/\\@/@/g' > $@ -man/%.1: man/%.1.in $(REPLACE_VARS_SED) - sed -f $(REPLACE_VARS_SED) < $< > $@ - -man/%.7: man/%.7.in $(REPLACE_VARS_SED) - sed -f $(REPLACE_VARS_SED) < $< > $@ - -man/%.8: man/%.8.in $(REPLACE_VARS_SED) - sed -f $(REPLACE_VARS_SED) < $< > $@ - -man/%.html: man/%.html.in $(REPLACE_VARS_SED) +man/%: man/%.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ epydoc.conf: epydoc.conf.in Makefile -- GitLab