Changes in BOOK/Makefile [da28cc3:4fe47e3]

File:

• BOOK/Makefile (modified) (9 diffs)

BOOK/Makefile

@@ -3 +3 @@
 
 VALIDATEDIR     := $(RENDERDIR)/validate
+DBXMLDIR        := $(RENDERDIR)/docbook
 PROFILEDIR      := $(RENDERDIR)/profile
 
@@ -23 +24 @@
                    ppc ppc64 \
                    alpha
+
+x86_ML          := 32
+x86_64_ML       := 32,64
+x86_64-64_ML    := 64
+sparc_ML        := 32
+sparc64_ML      := 32,64
+sparc64-64_ML   := 64
+mips_ML         := 32
+mips64_ML       := 32,n32,64
+mips64-64_ML    := 64
+ppc_ML          := 32
+ppc64_ML        := 32,64
+alpha_ML        := 64
 
 ifdef V
@@ -62 +76 @@
 $(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
 $(ARCHS_VD_XML):
-        @echo "Validating $(arch) book..."
+        @echo "Validating $(arch) against the CLFS Schema..."
         $(Q)mkdir -p $(VALIDATEDIR)
         $(Q)xmllint --nonet --noent --xinclude \
-          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
           -o $(VALIDATEDIR)/$(arch)-full.xml \
-          $(PWD)/$(arch)-index.xml
+          $(PWD)/$(arch)-index.xml \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
+
+ARCHS_DB_XML := $(ARCHS:%=%-db-xml)
+.PHONY: $(ARCHS_DB_XML)
+$(ARCHS_DB_XML): override arch = $(@:%-db-xml=%)
+$(ARCHS_DB_XML):
+        @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
+        @echo "Generating DocBook XML for $(arch)..."
+        $(Q)mkdir -p $(DBXMLDIR)
+        $(Q)xsltproc --nonet \
+          --stringparam clfs.arch "$(arch)" \
+          --stringparam clfs.multilib "$($(arch)_ML)" \
+          --output $(DBXMLDIR)/$(arch)-db.xml \
+          $(PWD)/stylesheets/clfs-profile.xsl \
+          $(VALIDATEDIR)/$(arch)-full.xml
 
 ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
@@ -73 +103 @@
 $(ARCHS_P_XML): override arch = $(@:%-profiled-xml=%)
 $(ARCHS_P_XML):
-        @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
-        @echo "Generating profiled $(arch) book..."
+        @$(MAKE) --no-print-directory $(arch)-db-xml
+        @echo "Profiling $(arch) for rendering..."
         $(Q)mkdir -p $(PROFILEDIR)
-        $(Q)xsltproc --nonet --stringparam profile.condition html \
+        $(Q)xsltproc --nonet \
+          --stringparam profile.condition html \
           --output $(PROFILEDIR)/$(arch)-html.xml \
           $(PWD)/stylesheets/lfs-xsl/profile.xsl \
-          $(VALIDATEDIR)/$(arch)-full.xml
+          $(DBXMLDIR)/$(arch)-db.xml
+
+ARCHS_VDB_XML := $(ARCHS:%=%-validate_db-xml)
+.PHONY: $(ARCHS_VDB_XML)
+$(ARCHS_VDB_XML): override arch = $(@:%-validate_db-xml=%)
+$(ARCHS_VDB_XML):
+        @echo "Validating $(arch) against the DocBook Schema..."
+        $(Q)xmllint --noout --nonet \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          $(PROFILEDIR)/$(arch)-html.xml \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
 
 ARCHS_HTML := $(ARCHS:%=%-html)
@@ -87 +129 @@
 $(ARCHS_HTML):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
+        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Rendering chunked XHTML of $(arch)..."
@@ -112 +155 @@
 $(ARCHS_NOCHUNKS):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
+        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Rendering Single File HTML of $(arch)..."
@@ -128 +172 @@
 $(ARCHS_FO):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
+        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Generating FO file of $(arch)..."
@@ -153 +198 @@
 $(ARCHS_VALIDATE): override arch =  $(@:%-validate=%)
 $(ARCHS_VALIDATE):
-        @echo "Validating $(arch)..."
+        @echo "Validating $(arch) against the CLFS Schema..."
         $(Q)xmllint --xinclude --noout --nonet \
-          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-          $(PWD)/$(arch)-index.xml
+          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+          $(PWD)/$(arch)-index.xml \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
 
 ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
@@ -166 +213 @@
         @mkdir -p $(TROUBLEDIR)
         $(Q)xmllint --xinclude --nonet \
-          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
           -o $(TROUBLEDIR)/dump-$(arch) \
-          $(PWD)/$(arch)-index.xml
+          $(PWD)/$(arch)-index.xml \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
         $(Q)xmllint --xinclude --noout --nonet \
-          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-          $(TROUBLEDIR)/dump-$(arch)
+          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+          $(TROUBLEDIR)/dump-$(arch) \
+          2>&1 | grep -v " validates$$"; \
+          if test $${?} -ne 0; then true; else false; fi
         @echo "You can now look at $(TROUBLEDIR)/dump-$(arch) to see the errors"