diff options
| author | Dan McGee <dan@archlinux.org> | 2011-12-07 12:33:41 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-12-08 09:17:39 -0600 |
| commit | 781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de (patch) | |
| tree | 4799c6842ac2d0e109313088c48f04fd03759684 /doc/Makefile.am | |
| parent | dacda1f6b3f2122d7d54cda9ed7d620301595ef1 (diff) | |
Use automake verbose helpers in custom make rules
This converts our script generation to use the built-in AM_V_GEN macro,
which honors the V= setting passed to make and allows one to see the
full command if they truly desire. The AM_V_at macro is also used in
place of an explicit @ so verbose-mode compiles show all commands being
run.
We can also use these two macros in doc generation to quiet it down to
the level we expect.
Other minor changes:
* a pointless test call is removed in test/pacman/tests/
* sed is used instead of dos2unix as we depend on it anyway
* consecutive chmod calls are reduced to a single call (e.g., '+x,a-x')
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index f449e727..2c6cc50f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -90,8 +90,10 @@ endif html: $(HTML_DOCS) -website: html - bsdtar czf website.tar.gz $(HTML_DOCS) \ +website: website.tar.gz + +website.tar.gz: html + $(AM_V_GEN)bsdtar czf $@ $(HTML_DOCS) \ asciidoc-override.css \ -C /etc/asciidoc/stylesheets/ \ asciidoc.css \ @@ -119,15 +121,15 @@ A2X_OPTS = \ # These rules are due to the includes and files of the asciidoc text $(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile - a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt + $(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt %.html: %.txt - asciidoc $(ASCIIDOC_OPTS) $*.txt - dos2unix $@ + $(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - $*.txt | \ + sed -e 's/\r$$//' > $@ HACKING.html: ../HACKING - asciidoc $(ASCIIDOC_OPTS) -o $@ ../HACKING - dos2unix $@ + $(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - ../HACKING | \ + sed -e 's/\r$$//' > $@ # Customizations for certain HTML docs $(HTML_MANPAGES): asciidoc.conf footer.txt Makefile |