hal/doc/spec Makefile.am,1.10,1.11

[David Zeuthen]

Update of /cvs/hal/hal/doc/spec
In directory kemper:/tmp/cvs-serv6797/doc/spec

Modified Files:
	Makefile.am 
Log Message:
2006-06-05  David Zeuthen  <davidz at redhat.com>

        * tools/Makefile.am: Be explicit about DIST_SUBDIRS as otherwise
        'make distcheck' breaks.

        * configure.in: Disable building docbook by default as it
        currently breaks 'make distcheck'.

        * doc/spec/Makefile.am: Also dist other XML files



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/doc/spec/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	14 May 2006 19:33:20 -0000	1.10
+++ Makefile.am	6 Jun 2006 03:17:27 -0000	1.11
@@ -1,25 +1,24 @@
 
-FIGURE_FILES =                \
-	hal-arch.png                \
-	hal-devices1.png            \
-	hal-fdi-example1.png      	\
-	hal-fdi-example2.png      	\
-	hal-fdi-example3.png      	\
+FIGURE_FILES =                  \
+	hal-arch.png            \
+	hal-devices1.png        \
+	hal-fdi-example1.png    \
+	hal-fdi-example2.png    \
+	hal-fdi-example3.png	\
 	hal-linux26.png	
 
-SPEC_XML_FILES =              \
-	hal-spec.xml                \
-  hal-spec-examples.xml       \
-  hal-spec-introduction.xml   \
-  hal-spec-fdi-files.xml      \
-  hal-spec-properties.xml
+SPEC_XML_EXTRA_FILES =                    \
+	hal-spec-examples.xml       \
+	hal-spec-introduction.xml   \
+	hal-spec-fdi-files.xml      \
+	hal-spec-properties.xml
 
 if DOCBOOK_DOCS_ENABLED
 
 htmldocdir = $(DOCDIR)/spec
 htmldoc_DATA = hal-spec.html $(FIGURE_FILES)
 
-hal-spec.html : $(SPEC_XML_FILES) $(FIGURE_FILES)
+hal-spec.html : hal-spec.xml $(SPEC_XML_EXTRA_FILES) $(FIGURE_FILES)
 	$(XMLTO) html-nochunks hal-spec.xml
 
 clean-local:
@@ -28,9 +27,11 @@
 
 endif # DOCBOOK_DOCS_ENABLED
 
-EXTRA_DIST = hal-spec.html    \
-  hal-spec.xml.in             \
-  example-manager.py	        \
-  hal-arch.dia	              \
-  hal-linux26.dia             \
+EXTRA_DIST =              \
+  hal-spec.html           \
+  hal-spec.xml.in         \
+  $(SPEC_XML_EXTRA_FILES) \
+  example-manager.py	  \
+  hal-arch.dia	          \
+  hal-linux26.dia         \
   $(FIGURE_FILES)