Changeset 05d60ce for Makefile

Timestamp:

07/06/2007 05:54:18 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

6dd1a9f

Parents:

0e6d3c0

Message:

Added a versose flag and other fixes to the Makefile.
Changed obfuscate.sh to try to prevent hangs when parsing nonchunked output.

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

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -6 +6 @@
 NOCHUNKS_OUTPUT=LFS-BOOK.html
 
+ifdef V
+  Q =
+else
+  Q = @
+endif
+
 lfs: validxml profile-html
         @echo "Generating chunked XHTML files..."
-        @xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
+        $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
           -stringparam rootid $(ROOT_ID) -stringparam base.dir $(BASEDIR)/ \
           stylesheets/lfs-chunked.xsl /tmp/lfs-html.xml
 
         @echo "Copying CSS code and images..."
-        @if [ ! -e $(BASEDIR)/stylesheets ]; then \
+        $(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \
           mkdir -p $(BASEDIR)/stylesheets; \
         fi;
-        @cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-        @if [ ! -e $(BASEDIR)/images ]; then \
+        $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
+        $(Q)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
+        $(Q)cp images/*.png $(BASEDIR)/images
+        $(Q)cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html
+        $(Q)cd $(BASEDIR)/; sed -i -e "s@../images@images@g" *.html
 
-        @echo "Running Tidy..."
-        @for filename in `find $(BASEDIR) -name "*.html"`; do \
+        @echo "Running Tidy and obfuscate.sh..."
+        $(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
           tidy -config tidy.conf $$filename; \
           true; \
@@ -32 +38 @@
         done;
 
-        @$(MAKE) wget-list
+        $(Q)$(MAKE) wget-list
 
 pdf: validxml
         @echo "Generating profiled XML for PDF..."
-        @xsltproc --nonet --stringparam profile.condition pdf \
+        $(Q)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) \
+        $(Q)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
+        $(Q)sed -i -e 's/span="inherit"/span="all"/' /tmp/lfs-pdf.fo
 
         @echo "Generating PDF file..."
-        @fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
+        $(Q)fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
 
 nochunks: validxml profile-html
         @echo "Generating non chunked XHTML file..."
-        @xsltproc --nonet -stringparam profile.condition html \
+        $(Q)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"  \
+        $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+        @echo "Running obfuscate.sh..."
+        $(Q)sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+        $(Q)sed -i -e "s@text/html@application/xhtml+xml@g"  \
           $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
 validxml:
         @echo "Validating the book..."
-        @xmllint --nonet --noent --xinclude --postvalid \
+        $(Q)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 \
+        $(Q)xsltproc --nonet --stringparam profile.condition html \
           --output /tmp/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
           /tmp/lfs-full.xml
@@ -73 +80 @@
 wget-list:
         @echo "Generating wget list..."
-        @mkdir -p $(BASEDIR)
-        @xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \
+        $(Q)mkdir -p $(BASEDIR)
+        $(Q)xsltproc --xinclude --nonet --output $(BASEDIR)/wget-list \
           stylesheets/wget-list.xsl chapter03/chapter03.xml
 
-dump-commands:
+dump-commands: validxml
         @echo "Dumping book commands..."
-        @xsltproc --xinclude --nonet --output $(DUMPDIR)/ \
-           stylesheets/dump-commands.xsl index.xml
+        $(Q)xsltproc --output $(DUMPDIR)/ \
+           stylesheets/dump-commands.xsl /tmp/lfs-full.xml
 
 validate:
         @echo "Validating the book..."
-        @xmllint --noout --nonet --xinclude --postvalid index.xml
+        $(Q)xmllint --noout --nonet --xinclude --postvalid index.xml
 
 all: lfs nochunks pdf dump-commands