diff options
| author | Mark Wielaard <mjw@redhat.com> | 2010-01-05 10:29:27 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2010-01-05 10:29:27 +0100 |
| commit | c232b6d78fb94df3dea3ea2076a3cf34e8de99a4 (patch) | |
| tree | e601f028b2533bd2d3f9a6e9c3225e45cbde0b46 /doc | |
| parent | 74b3bfdddf44251273fae4e957885e1de9269687 (diff) | |
| download | systemtap-steved-c232b6d78fb94df3dea3ea2076a3cf34e8de99a4.tar.gz systemtap-steved-c232b6d78fb94df3dea3ea2076a3cf34e8de99a4.tar.xz systemtap-steved-c232b6d78fb94df3dea3ea2076a3cf34e8de99a4.zip | |
Make publican invocation make -j safe.
publican isn't make -j safe. So cheat a little, always create pdf and html
at the same time, then make html depend on pdf build for copying.
* doc/beginners/Makefile.am ($(SBG).pdf): Also generate html version.
($(SBG).html): Depend on pdf version, then copy.
* doc/beginners/Makefile.in: Regenerated.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/beginners/Makefile.am | 7 | ||||
| -rw-r--r-- | doc/beginners/Makefile.in | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/beginners/Makefile.am b/doc/beginners/Makefile.am index 29ffeaba..e3055967 100644 --- a/doc/beginners/Makefile.am +++ b/doc/beginners/Makefile.am @@ -13,12 +13,13 @@ BEGIN_INSTALL_DIR = $(DOC_INSTALL_DIR)/$(SBG) if BUILD_PUBLICAN all: $(SBG).pdf $(SBG)/index.html +# publican isn't make -j safe. So cheat a little, always create pdf and html +# at the same time, then make html depend on pdf build for copying. $(SBG).pdf: - publican build --formats=pdf --langs=en-US && \ + publican build --formats=pdf,html --langs=en-US && \ mv build/en-US/pdf/*$(SBG)*.pdf $(SBG).pdf -$(SBG)/index.html: - publican build --formats=html --langs=en-US && \ +$(SBG)/index.html: $(SBG).pdf mv build/en-US/html $(SBG) clean-local: diff --git a/doc/beginners/Makefile.in b/doc/beginners/Makefile.in index 2bae95f3..58cfb266 100644 --- a/doc/beginners/Makefile.in +++ b/doc/beginners/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -370,12 +370,13 @@ uninstall-am: uninstall-local @BUILD_PUBLICAN_TRUE@all: $(SBG).pdf $(SBG)/index.html +# publican isn't make -j safe. So cheat a little, always create pdf and html +# at the same time, then make html depend on pdf build for copying. @BUILD_PUBLICAN_TRUE@$(SBG).pdf: -@BUILD_PUBLICAN_TRUE@ publican build --formats=pdf --langs=en-US && \ +@BUILD_PUBLICAN_TRUE@ publican build --formats=pdf,html --langs=en-US && \ @BUILD_PUBLICAN_TRUE@ mv build/en-US/pdf/*$(SBG)*.pdf $(SBG).pdf -@BUILD_PUBLICAN_TRUE@$(SBG)/index.html: -@BUILD_PUBLICAN_TRUE@ publican build --formats=html --langs=en-US && \ +@BUILD_PUBLICAN_TRUE@$(SBG)/index.html: $(SBG).pdf @BUILD_PUBLICAN_TRUE@ mv build/en-US/html $(SBG) @BUILD_PUBLICAN_TRUE@clean-local: |