[svnbook commit] r3459 - Fix Makefile target 'epub'

[codesite-noreply at google.com]

Author: dongsheng.song at gmail.com
Date: Tue Mar 31 22:24:17 2009
New Revision: 3459

Modified:
    trunk/src/de/book/   (props changed)
    trunk/src/en/book/   (props changed)
    trunk/src/tools/Makefile.base-rules
    trunk/src/tools/Makefile.base-vars

Log:
Fix Makefile target 'epub'


Modified: trunk/src/tools/Makefile.base-rules
==============================================================================
--- trunk/src/tools/Makefile.base-rules	(original)
+++ trunk/src/tools/Makefile.base-rules	Tue Mar 31 22:24:17 2009
@@ -73,10 +73,14 @@
  	$(TOOLS_DIR)/bin/run-fop.sh -fo $(FO_TARGET) -ps $(PS_TARGET)

  # Requires at least docbook-xsl-1.74
-epub: $(EPUB_TARGET)
+epub: book/svn-book.xml $(EPUB_TARGET)
  $(EPUB_TARGET): $(ALL_SOURCE)
  	$(ENSURE_XSL)
-	$(TOOLS_DIR)/xsl/epub/bin/dbtoepub $(XML_SOURCE)
+	$(TOOLS_DIR)/xsl/epub/bin/dbtoepub book/svn-book.xml
+	mv svn-book.epub $(EPUB_TARGET)
+
+book/svn-book.xml: version
+	xmllint --nonet --noent --xinclude --postvalid --output book/svn-book.xml  
book/book.xml

  # Install targets
  $(INSTALL_SUBDIR):
@@ -110,10 +114,9 @@
  clean:
  	rm -f $(VERSION_SOURCE) $(HTML_TARGET)
  	rm -f $(HTML_ARCH_TARGET) $(HTML_CHUNK_ARCH_TARGET)
-	rm -f $(FO_TARGET) $(PDF_TARGET) $(PS_TARGET)
+	rm -f $(FO_TARGET) $(PDF_TARGET) $(PS_TARGET) $(EPUB_TARGET)
  	rm -rf $(HTML_CHUNK_DIR)

  # Utility targets
  valid: $(VERSION_SOURCE)
  	$(XMLLINT) --noout --nonet --valid $(XML_SOURCE)
-

Modified: trunk/src/tools/Makefile.base-vars
==============================================================================
--- trunk/src/tools/Makefile.base-vars	(original)
+++ trunk/src/tools/Makefile.base-vars	Tue Mar 31 22:24:17 2009
@@ -56,7 +56,7 @@
  EPUB_TARGET = $(DIR)/$(OUTNAME).epub
  XML_SOURCE = $(DIR)/$(NAME).xml
  VERSION_SOURCE = $(DIR)/version.xml
-ALL_SOURCE = $(DIR)/*.xml
+ALL_SOURCE = $(filter-out $(DIR)/version.xml $(DIR)/svn-book.xml,  
$(wildcard $(DIR)/*.xml))
  STYLESHEET = $(DIR)/styles.css
  INSTALL_SUBDIR = $(INSTALL_DIR)/$(NAME)