[svnbook] r4267 committed - Cleanup what appears to be some sloppiness around the epub-related...
svnbook at googlecode.com
svnbook at googlecode.com
Thu May 31 15:18:51 CDT 2012
Revision: 4267
Author: cmpilato at gmail.com
Date: Thu May 31 13:18:37 2012
Log: Cleanup what appears to be some sloppiness around the epub-related
build rules.
* tools/Makefile.base-rules
(epub): Depend on $(UNIFIED_XML_TARGET) rather than
book/xml-book.xml explicitly.
(UNIFIED_XML_TARGET): Was book/svn-book.xml explicitly.
(clean): Remove the UNIFIED_XML_TARGET, too.
* tools/Makefile.base-vars
(UNIFIED_XML_TARGET): New.
(ALL_SOURCE): Filter UNIFIED_XML_TARGET, not $(DIR)/svn-book.xml
explicitly.
http://code.google.com/p/svnbook/source/detail?r=4267
Modified:
/trunk/tools/Makefile.base-rules
/trunk/tools/Makefile.base-vars
=======================================
--- /trunk/tools/Makefile.base-rules Thu Aug 26 08:55:13 2010
+++ /trunk/tools/Makefile.base-rules Thu May 31 13:18:37 2012
@@ -73,18 +73,18 @@
$(TOOLS_DIR)/bin/run-fop.sh -fo $(FO_TARGET) -ps $(PS_TARGET)
# Requires at least docbook-xsl-1.74
-epub: book/svn-book.xml $(EPUB_TARGET)
+epub: $(UNIFIED_XML_TARGET) $(EPUB_TARGET)
$(EPUB_TARGET): $(ALL_SOURCE)
$(ENSURE_XSL)
if [ -x /usr/bin/dbtoepub ] ; then \
- /usr/bin/dbtoepub -c book/styles.css -v book/svn-book.xml ;\
+ /usr/bin/dbtoepub -c book/styles.css -v $(UNIFIED_XML_TARGET) ;\
else \
- $(TOOLS_DIR)/xsl/epub/bin/dbtoepub -c book/styles.css -v
book/svn-book.xml ; \
+ $(TOOLS_DIR)/xsl/epub/bin/dbtoepub -c book/styles.css -v
$(UNIFIED_XML_TARGET) ; \
fi
mv svn-book.epub $(EPUB_TARGET)
-book/svn-book.xml: version
- xmllint --nonet --noent --xinclude --postvalid --output book/svn-book.xml
book/book.xml
+$(UNIFIED_XML_TARGET): version
+ xmllint --nonet --noent --xinclude --postvalid --output
$(UNIFIED_XML_TARGET) book/book.xml
# Install targets
$(INSTALL_SUBDIR):
@@ -116,7 +116,7 @@
# Clean targets
clean:
- rm -f $(VERSION_SOURCE) $(HTML_TARGET)
+ rm -f $(VERSION_SOURCE) $(HTML_TARGET) $(UNIFIED_XML_TARGET)
rm -f $(HTML_ARCH_TARGET) $(HTML_CHUNK_ARCH_TARGET)
rm -f $(FO_TARGET) $(PDF_TARGET) $(PS_TARGET) $(EPUB_TARGET)
rm -rf $(HTML_CHUNK_DIR)
=======================================
--- /trunk/tools/Makefile.base-vars Tue Mar 31 22:24:17 2009
+++ /trunk/tools/Makefile.base-vars Thu May 31 13:18:37 2012
@@ -54,9 +54,10 @@
PS_TARGET = $(DIR)/$(OUTNAME).ps
FO_TARGET = $(DIR)/$(OUTNAME).fo
EPUB_TARGET = $(DIR)/$(OUTNAME).epub
+UNIFIED_XML_TARGET = $(DIR)/$(OUTNAME).xml
XML_SOURCE = $(DIR)/$(NAME).xml
VERSION_SOURCE = $(DIR)/version.xml
-ALL_SOURCE = $(filter-out $(DIR)/version.xml $(DIR)/svn-book.xml,
$(wildcard $(DIR)/*.xml))
+ALL_SOURCE = $(filter-out $(DIR)/version.xml $(UNIFIED_XML_TARGET),
$(wildcard $(DIR)/*.xml))
STYLESHEET = $(DIR)/styles.css
INSTALL_SUBDIR = $(INSTALL_DIR)/$(NAME)
More information about the svnbook-dev
mailing list