Changeset 924ab90 for Makefile

Timestamp:

03/05/2012 08:16:58 PM (12 years ago)

Author:

Matthew Burgess <matthew@…>

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, 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:

0c90d60

Parents:

45eab11

Message:

Allow aux-file-data.sh to be run successfully from the command line, and rename validxml target to validate. Thanks to Pierre Labastie for the report.

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

File:

• Makefile (modified) (6 diffs)

Makefile

@@ -14 +14 @@
 endif
 
-lfs: maketar validxml profile-html
+lfs: validate profile-html
         @echo "Generating chunked XHTML files..."
         $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
@@ -42 +42 @@
         $(Q)$(MAKE) wget-list
 
-pdf: validxml
+pdf: validate
         @echo "Generating profiled XML for PDF..."
         $(Q)xsltproc --nonet --stringparam profile.condition pdf \
@@ -61 +61 @@
         $(Q)fop $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
 
-nochunks: maketar validxml profile-html
+nochunks: validate profile-html
         @echo "Generating non chunked XHTML file..."
         $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
@@ -83 +83 @@
         $(Q)rm -f $(RENDERTMP)/lfs-pdf.fo
 
-validxml: tmpdir
+validate: tmpdir
         @echo "Processing bootscripts..."
         $(Q)bash process-scripts.sh
@@ -91 +91 @@
         $(Q)rm -f appendices/*.script
         $(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
+        @echo "Validation complete."
 
-maketar:
-        $(Q)if [ "x$(MAKETAR)" == "x" ]; then \
-           echo "Making tarballs..."; \
-           sh make-aux-files.sh; \
-        fi;
-
-profile-html: validxml
+profile-html: validate
         @echo "Generating profiled XML for XHTML..."
         $(Q)xsltproc --nonet --stringparam profile.condition html \
@@ -121 +116 @@
 
 
-dump-commands: validxml
+dump-commands: validate
         @echo "Dumping book commands..."
         $(Q)xsltproc --output $(DUMPDIR)/ \
            stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
 
-validate: maketar validxml
-        @echo "Validation complete."
 
 all: lfs nochunks pdf dump-commands md5sums
 
 .PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate \
-         validxml wget-list maketar md5sums
+         validate wget-list maketar md5sums