Changeset bc7834d

Timestamp:

Jan 1, 2010, 3:44:49 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

ff39de2

Parents:

2b77c9d4

Message:

Generate the profiled XML in its own make target.

File:

• BOOK/Makefile (modified) (5 diffs)

BOOK/Makefile

@@ -8 +8 @@
 RENDERTMP       := $(WORKDIR)/tmp
 CHUNK_QUIET     := 1
-ROOT_ID         :=
+ROOT_ID  :=
 
 S               := -
@@ -14 +14 @@
 ARCHS           := x86 x86_64 x86_64-64 sparc sparc64 sparc64-64 mips mips64 mips64-64 \
                    ppc ppc64 alpha
+
+ARCHS_P_XML     := $(ARCHS:%=%-profiled-xml)
 
 ARCHS_HTML      := $(ARCHS:%=%$(S)html)
@@ -61 +63 @@
           $(PWD)/stylesheets/top-index.xsl $(PWD)/index.xml
 
+$(ARCHS_P_XML): override profiled_xml_arch = $(@:%-profiled-xml=%)
+$(ARCHS_P_XML):
+        @echo "Validating $(profiled_xml_arch) book..."
+        $(Q)xmllint --nonet --noent --xinclude --postvalid \
+          -o $(RENDERTMP)/$(profiled_xml_arch)-full.xml $(PWD)/$(profiled_xml_arch)-index.xml
+
+        @echo "Generating profiled $(profiled_xml_arch) book for XHTML..."
+        $(Q)xsltproc --nonet --stringparam profile.condition html \
+          --output $(RENDERTMP)/$(profiled_xml_arch)-html.xml \
+          $(PWD)/stylesheets/lfs-xsl/profile.xsl $(RENDERTMP)/$(profiled_xml_arch)-full.xml
+
 $(ARCHS_HTML): override html_arch = $(@:%$(S)html=%)
 $(ARCHS_HTML):
-        @echo "Validating $(html_arch) book..."
-        $(Q)xmllint --nonet --noent --xinclude --postvalid \
-          -o $(RENDERTMP)/$(html_arch)-full.xml $(PWD)/$(html_arch)-index.xml
-
-        @echo "Generating profiled $(html_arch) book for XHTML..."
-        $(Q)xsltproc --nonet --stringparam profile.condition html \
-          --output $(RENDERTMP)/$(html_arch)-html.xml \
-          $(PWD)/stylesheets/lfs-xsl/profile.xsl $(RENDERTMP)/$(html_arch)-full.xml
+        @$(MAKE) $(html_arch)-profiled-xml
 
         @echo "Rendering chunked XHTML of $(html_arch)..."
@@ -91 +97 @@
 $(ARCHS_NOCHUNKS): override nochunk_arch = $(@:%$(S)nochunks=%)
 $(ARCHS_NOCHUNKS):
-        @echo "Validating $(nochunk_arch) book..."
-        $(Q)xmllint --nonet --noent --xinclude --postvalid \
-          -o $(RENDERTMP)/$(nochunk_arch)-full.xml $(PWD)/$(nochunk_arch)-index.xml
-
-        @echo "Generating profiled $(nochunk_arch) book for XHTML..."
-        $(Q)xsltproc --nonet --stringparam profile.condition html \
-          --output $(RENDERTMP)/$(nochunk_arch)-html.xml \
-          $(PWD)/stylesheets/lfs-xsl/profile.xsl \
-          $(RENDERTMP)/$(nochunk_arch)-full.xml
+        @$(MAKE) $(nochunk_arch)-profiled-xml
 
         @echo "Rendering Single File HTML of $(nochunk_arch)..."
@@ -118 +116 @@
 $(ARCHS_PDF): override pdf_arch =  $(@:%$(S)pdf=%)
 $(ARCHS_PDF):
-        @echo "Validating $(pdf_arch) book..."
-        $(Q)xmllint --nonet --noent --xinclude --postvalid \
-          -o $(RENDERTMP)/$(pdf_arch)-full.xml $(PWD)/$(pdf_arch)-index.xml
-
-        @echo "Generating profiled $(pdf_arch) book for PDF..."
-        $(Q)xsltproc --nonet --stringparam profile.condition pdf \
-          --output $(RENDERTMP)/$(pdf_arch)-pdf.xml \
-          $(PWD)/stylesheets/lfs-xsl/profile.xsl \
-          $(RENDERTMP)/$(pdf_arch)-full.xml
+        @$(MAKE) $(pdf_arch)-profiled-xml
 
         @echo "Generating FO file of $(pdf_arch)..."