Refactored the Makefile.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8202 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

3 files changed, 78 insertions, 52 deletions

diff --git a/Makefile b/Makefile
index d4b88f8f2..8710618fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,75 +1,90 @@
 BASEDIR=~/lfs-book
 DUMPDIR=~/lfs-commands
-CHUNK_QUIET=0
+CHUNK_QUIET=1
+ROOT_ID=""
 PDF_OUTPUT=LFS-BOOK.pdf
 NOCHUNKS_OUTPUT=LFS-BOOK.html
 
-lfs:
-	xsltproc --xinclude --nonet -stringparam profile.condition html \
-	-stringparam chunk.quietly $(CHUNK_QUIET) -stringparam base.dir $(BASEDIR)/ \
-	stylesheets/lfs-chunked.xsl index.xml
+lfs: validxml profile-html
+	@echo "Generating chunked XHTML files..."
+	@xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
+	  -stringparam rootid $(ROOT_ID) -stringparam base.dir $(BASEDIR)/ \
+	  stylesheets/lfs-chunked.xsl /tmp/lfs-html.xml
 
-	if [ ! -e $(BASEDIR)/stylesheets ]; then \
+	@echo "Copying CSS code and images..."
+	@if [ ! -e $(BASEDIR)/stylesheets ]; then \
 	  mkdir -p $(BASEDIR)/stylesheets; \
 	fi;
-	cp stylesheets/*.css $(BASEDIR)/stylesheets
-
-	if [ ! -e $(BASEDIR)/images ]; then \
+	@cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
+	@if [ ! -e $(BASEDIR)/images ]; then \
 	  mkdir -p $(BASEDIR)/images; \
 	fi;
-	cp images/*.png $(BASEDIR)/images
-	cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" \
-	  *.html
-	cd $(BASEDIR)/; sed -i -e "s@../images@images@g" \
-	  *.html
+	@cp images/*.png $(BASEDIR)/images
+	@cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html
+	@cd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html
 
-	for filename in `find $(BASEDIR) -name "*.html"`; do \
+	@echo "Running Tidy..."
+	@for filename in `find $(BASEDIR) -name "*.html"`; do \
 	  tidy -config tidy.conf $$filename; \
 	  true; \
 	  sh obfuscate.sh $$filename; \
 	  sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
 	done;
 
-	$(MAKE) wget-list
+	@$(MAKE) wget-list
 
-wget-list:
-	mkdir -p $(BASEDIR)
-	xsltproc --xinclude --nonet stylesheets/wget-list.xsl chapter03/chapter03.xml > $(BASEDIR)/wget-list
-
-# Uncomment this for testing and stable versions
-#pdf:
-#	xsltproc --xinclude --nonet --stringparam profile.condition pdf \
-#		--output $(BASEDIR)/lfs-pdf.xml stylesheets/lfs-profile.xsl index.xml
-#	xsltproc --nonet --output $(BASEDIR)/lfs-pdf.fo stylesheets/lfs-pdf.xsl \
-#		$(BASEDIR)/lfs-pdf.xml
-#	sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo
-#	fop.sh $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
-#	rm $(BASEDIR)/lfs-pdf.xml $(BASEDIR)/lfs-pdf.fo
-
-# Remove this for testing and stable versions
-pdf:
-	xsltproc --xinclude --nonet --output $(BASEDIR)/lfs-pdf.fo \
-		stylesheets/lfs-pdf.xsl index.xml
-	sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo
-	fop.sh $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
-	rm $(BASEDIR)/lfs-pdf.fo
-
-nochunks:
-	xsltproc --xinclude --nonet -stringparam profile.condition html \
-	--output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
-	  stylesheets/lfs-nochunks.xsl index.xml
-
-	tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
-
-	sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-
-	sed -i -e "s@text/html@application/xhtml+xml@g"  \
+pdf: validxml
+	@echo "Generating profiled XML for PDF..."
+	@xsltproc --nonet --stringparam profile.condition pdf \
+	  --output /tmp/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
+	  /tmp/lfs-full.xml
+
+	@echo "Generating FO file..."
+	@xsltproc --nonet -stringparam rootid $(ROOT_ID) \
+	  --output /tmp//lfs-pdf.fo stylesheets/lfs-pdf.xsl /tmp/lfs-pdf.xml
+	@sed -i -e 's/span="inherit"/span="all"/' /tmp/lfs-pdf.fo
+
+	@echo "Generating PDF file..."
+	@fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
+
+nochunks: validxml profile-html
+	@echo "Generating non chunked XHTML file..."
+	@xsltproc --nonet -stringparam profile.condition html \
+	  -stringparam rootid $(ROOT_ID) --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
+	  stylesheets/lfs-nochunks.xsl /tmp/lfs-html.xml
+
+	@echo "Running Tidy..."
+	@tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+	@sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+	@sed -i -e "s@text/html@application/xhtml+xml@g"  \
 	  $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
+validxml:
+	@echo "Validating the book..."
+	@xmllint --nonet --noent --xinclude --postvalid \
+	  -o /tmp/lfs-full.xml index.xml
+
+profile-html: validxml
+	@echo "Generating profiled XML for XHTML..."
+	@xsltproc --nonet --stringparam profile.condition html \
+	  --output /tmp/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
+	  /tmp/lfs-full.xml
+
+wget-list:
+	@echo "Generating wget list..."
+	@mkdir -p $(BASEDIR)
+	@xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \
+	  stylesheets/wget-list.xsl chapter03/chapter03.xml
+
 dump-commands:
-	xsltproc --xinclude --nonet --output $(DUMPDIR)/ \
+	@echo "Dumping book commands..."
+	@xsltproc --xinclude --nonet --output $(DUMPDIR)/ \
 	   stylesheets/dump-commands.xsl index.xml
 
 validate:
-	xmllint --noout --nonet --xinclude --postvalid index.xml
+	@echo "Validating the book..."
+	@xmllint --noout --nonet --xinclude --postvalid index.xml
+
+all: lfs nochunks pdf dump-commands
 
+.PHONY : all dump-commands lfs nochunks pdf profile-html validate validxml wget-list
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b0e767d06..239cb651e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,17 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>2007-07-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - Updated the stylesheets and Makefile to use the new
+          XSL code and Fop-0.93.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2007-06-30</para>
       <itemizedlist>
diff --git a/general.ent b/general.ent
index 7f143d1b8..c4614fbab 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20070630">
-<!ENTITY releasedate "June 30, 2007">
+<!ENTITY version "SVN-20070706">
+<!ENTITY releasedate "July 6, 2007">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->