Changes in BOOK/Makefile [4fe47e3:d63b7ee]

File:

• BOOK/Makefile (modified) (15 diffs)

BOOK/Makefile

@@ -1 @@
-TOP             := $(PWD)
+TOP             := $(shell pwd)
 RENDERDIR       := $(TOP)/../render
 
 VALIDATEDIR     := $(RENDERDIR)/validate
-DBXMLDIR        := $(RENDERDIR)/docbook
 PROFILEDIR      := $(RENDERDIR)/profile
 
@@ -24 +23 @@
                    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
@@ -68 +54 @@
         @echo "Rendering the top-level index..."
         $(Q)xsltproc --nonet --output $(HTMLDIR)/index.html \
-          $(PWD)/stylesheets/top-index.xsl \
-          $(PWD)/index.xml
+          $(TOP)/stylesheets/top-index.xsl \
+          $(TOP)/index.xml
         @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(HTMLDIR)/index.html
 
@@ -76 +62 @@
 $(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
 $(ARCHS_VD_XML):
-        @echo "Validating $(arch) against the CLFS Schema..."
+        @echo "Validating $(arch) book..."
         $(Q)mkdir -p $(VALIDATEDIR)
         $(Q)xmllint --nonet --noent --xinclude \
-          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
           -o $(VALIDATEDIR)/$(arch)-full.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
+          $(TOP)/$(arch)-index.xml
 
 ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
@@ -103 +73 @@
 $(ARCHS_P_XML): override arch = $(@:%-profiled-xml=%)
 $(ARCHS_P_XML):
-        @$(MAKE) --no-print-directory $(arch)-db-xml
-        @echo "Profiling $(arch) for rendering..."
+        @$(MAKE) --no-print-directory $(arch)-validate_dump-xml
+        @echo "Generating profiled $(arch) book..."
         $(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 \
-          $(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
+          $(TOP)/stylesheets/lfs-xsl/profile.xsl \
+          $(VALIDATEDIR)/$(arch)-full.xml
 
 ARCHS_HTML := $(ARCHS:%=%-html)
@@ -129 +87 @@
 $(ARCHS_HTML):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
-        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Rendering chunked XHTML of $(arch)..."
@@ -136 +93 @@
           -stringparam rootid "$(ROOT_ID)" \
           -stringparam base.dir $(HTMLDIR)/$(arch)/ \
-          $(PWD)/stylesheets/clfs-chunked.xsl \
+          $(TOP)/stylesheets/clfs-chunked.xsl \
           $(PROFILEDIR)/$(arch)-html.xml
 
         @echo "Copying CSS code and images for $(arch)..."
         $(Q)mkdir -p $(HTMLDIR)/$(arch)/stylesheets
-        $(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
+        $(Q)cp $(TOP)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
         $(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(HTMLDIR)/$(arch)/*.html
         $(Q)mkdir -p $(HTMLDIR)/$(arch)/images
-        $(Q)cp $(PWD)/images/*.png $(HTMLDIR)/$(arch)/images
+        $(Q)cp $(TOP)/images/*.png $(HTMLDIR)/$(arch)/images
         $(Q)sed -i -e "s@../images@images@g" $(HTMLDIR)/$(arch)/*.html
 
@@ -155 +112 @@
 $(ARCHS_NOCHUNKS):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
-        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Rendering Single File HTML of $(arch)..."
@@ -161 +117 @@
         $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
           --output $(NOCHUNKDIR)/CLFS-$(arch).html \
-          $(PWD)/stylesheets/clfs-nochunks.xsl \
+          $(TOP)/stylesheets/clfs-nochunks.xsl \
           $(PROFILEDIR)/$(arch)-html.xml
 
@@ -172 +128 @@
 $(ARCHS_FO):
         @$(MAKE) --no-print-directory $(arch)-profiled-xml
-        @$(MAKE) --no-print-directory $(arch)-validate_db-xml
 
         @echo "Generating FO file of $(arch)..."
@@ -178 +133 @@
         $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
           --output $(FODIR)/$(arch).fo \
-          $(PWD)/stylesheets/clfs-pdf.xsl \
+          $(TOP)/stylesheets/clfs-pdf.xsl \
           $(PROFILEDIR)/$(arch)-html.xml
         $(Q)sed -i -e 's/span="inherit"/span="all"/' $(FODIR)/$(arch).fo
@@ -198 +153 @@
 $(ARCHS_VALIDATE): override arch =  $(@:%-validate=%)
 $(ARCHS_VALIDATE):
-        @echo "Validating $(arch) against the CLFS Schema..."
+        @echo "Validating $(arch)..."
         $(Q)xmllint --xinclude --noout --nonet \
-          --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
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          $(TOP)/$(arch)-index.xml
 
 ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
@@ -213 +166 @@
         @mkdir -p $(TROUBLEDIR)
         $(Q)xmllint --xinclude --nonet \
-          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
           -o $(TROUBLEDIR)/dump-$(arch) \
-          $(PWD)/$(arch)-index.xml \
-          2>&1 | grep -v " validates$$"; \
-          if test $${?} -ne 0; then true; else false; fi
+          $(TOP)/$(arch)-index.xml
         $(Q)xmllint --xinclude --noout --nonet \
-          --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
+          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
+          $(TROUBLEDIR)/dump-$(arch)
         @echo "You can now look at $(TROUBLEDIR)/dump-$(arch) to see the errors"
 
@@ -234 +183 @@
         $(Q)xsltproc --xinclude --nonet \
           --output $(DUMPDIR)/$(arch)/ \
-          $(PWD)/stylesheets/dump-commands.xsl \
-          $(PWD)/$(arch)-index.xml
+          $(TOP)/stylesheets/dump-commands.xsl \
+          $(TOP)/$(arch)-index.xml
 
 ARCHS_DLLIST := $(ARCHS:%=%-dllist)
@@ -246 +195 @@
         $(Q)xsltproc --xinclude --nonet \
           --output $(DLLISTDIR)/$(arch).list \
-          $(PWD)/stylesheets/wget.xsl \
-          $(PWD)/$(arch)-index.xml
+          $(TOP)/stylesheets/wget.xsl \
+          $(TOP)/$(arch)-index.xml
 
 FG_GREEN := $(shell echo -e '\e[0;32m')