summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-02-25 16:38:27 -0800
committerKeith Packard <keithp@keithp.com>2011-02-25 20:28:58 -0800
commitdc8f52e77f51b6fa8908d9611c3f7e3cfbbaf2d1 (patch)
tree2d11730088ded066c40e631faee2450caa81fcfc
parentfd4d9c75c265add8d6cc74afb341c9c4f2ec1073 (diff)
hw/dmx/doc: Add explicit dependency for all doxygen output files
Instead of listing one of the doxygen output files and depending on sequential execution to ensure that the other files were present before make checked for them, create explicit dependencies so that make will not check for the additional files until after doxygen has been run. This allows parallel make to work correctly in this directory. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Kristian Høgsberg <krh@bitplanet.net>
-rw-r--r--hw/dmx/doc/Makefile.am63
1 files changed, 39 insertions, 24 deletions
diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am
index 838b6f270..8e7360288 100644
--- a/hw/dmx/doc/Makefile.am
+++ b/hw/dmx/doc/Makefile.am
@@ -24,34 +24,14 @@ doc_sources = dmx.xml scaled.xml
# Developer's documentation is not installed
if ENABLE_DEVEL_DOCS
include $(top_srcdir)/doc/xml/xmlrules-noinst.in
-
-if HAVE_DOXYGEN
-
-DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
-
-all-local: html/annotated.html
-
-dist-local: html/annotated.html
-
-html/annotated.html: $(DOXYGEN_SRC)
- $(DOXYGEN) doxygen.conf
-
-maintainer-clean-local:
- rm -rf html/
-endif
endif ENABLE_DEVEL_DOCS
-EXTRA_DIST = \
- $(XML_FILES) \
- DMXSpec.txt \
- DMXSpec-v1.txt \
+DOXYGEN_HEAD=\
+ html/annotated.html
+
+DOXYGEN_REST= \
dmx.txt \
- doxygen.conf \
- doxygen.css \
- doxygen.foot \
- doxygen.head \
scaled.txt \
- html/annotated.html \
html/ChkNotMaskEv_8c.html \
html/ChkNotMaskEv_8h.html \
html/ChkNotMaskEv_8h_source.html \
@@ -254,6 +234,41 @@ EXTRA_DIST = \
html/usb-private_8h.html \
html/usb-private_8h_source.html
+DOXYGEN_FILES=$(DOXYGEN_HEAD) $(DOXYGEN_REST)
+
+EXTRA_DIST = \
+ $(XML_FILES) \
+ DMXSpec.txt \
+ DMXSpec-v1.txt \
+ doxygen.conf \
+ doxygen.css \
+ doxygen.foot \
+ doxygen.head \
+ $(DOXYGEN_FILES)
+
+if ENABLE_DEVEL_DOCS
+if HAVE_DOXYGEN
+
+DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
+
+all-local: $(DOXYGEN_FILES)
+
+dist-local: $(DOXYGEN_FILES)
+
+$(DOXYGEN_HEAD): $(DOXYGEN_SRC)
+ $(DOXYGEN) doxygen.conf
+
+$(DOXYGEN_REST): $(DOXYGEN_HEAD)
+
+maintainer-clean-local:
+ rm -rf html/ scaled.txt dmx.txt
+
+distclean-local:
+ rm -rf html/ scaled.txt dmx.txt
+
+endif HAVE_DOXYGEN
+endif ENABLE_DEVEL_DOCS
+
$(builddir)/doxygen.head:
$(LN_S) $(srcdir)/doxygen.head $@