Changeset b6dd23c7 for Makefile

Timestamp:

01/27/2024 09:42:07 PM (4 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.1, 12.1-rc1, multilib, trunk, xry111/arm64, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc

Children:

b8d33a5

Parents:

16d0182

git-author:

Pierre Labastie <pierre.labastie@…> (01/27/2024 04:03:47 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (01/27/2024 09:42:07 PM)

Message:

Makefile: improvements in xsltproc commands

• remove some useless --xinclude
• write only one option per line
• use --encode UTF-8 instead of --noent (which is useless after profiling anyway
• try to be consistent in option order
• use --output instead of -o

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -124 +124 @@
         $(Q)xsltproc --nonet                               \
                 --xinclude                            \
+                --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/lfs-html2.xml   \
-                --stringparam profile.revision $(REV) \
                 stylesheets/lfs-xsl/profile.xsl       \
                 index.xml
 
         @echo "Validating the book..."
-        $(Q)xmllint --nonet                      \
-               --noent                      \
-               --postvalid                  \
-               -o $(RENDERTMP)/lfs-full.xml \
+        $(Q)xmllint --nonet                            \
+               --encode UTF-8                     \
+               --postvalid                        \
+               --output $(RENDERTMP)/lfs-full.xml \
                $(RENDERTMP)/lfs-html2.xml
 
@@ -155 +155 @@
         @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
         $(Q)mkdir -p $(BASEDIR)
-        $(Q)xsltproc --xinclude --nonet            \
+        $(Q)xsltproc --nonet                       \
+                --xinclude                    \
                 --output $(BASEDIR)/wget-list \
                 stylesheets/wget-list.xsl     \
@@ -161 +162 @@
 
 $(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
-        $(Q)xsltproc --nonet --xinclude                   \
+        $(Q)xsltproc --nonet                               \
+                --xinclude                            \
                 --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/wget-list.xml   \
                 stylesheets/lfs-xsl/profile.xsl       \
                 chapter03/chapter03.xml
-        $(Q)xsltproc --xinclude --nonet                  \
+
+        $(Q)xsltproc --nonet                              \
                 --output $(BASEDIR)/wget-list-$(REV) \
                 stylesheets/wget-list.xsl            \
@@ -176 +179 @@
         $(Q)mkdir -p $(BASEDIR)
 
-        $(Q)xsltproc --nonet --xinclude                   \
+        $(Q)xsltproc --nonet                               \
+                --xinclude                            \
                 --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/md5sum.xml      \
@@ -182 +186 @@
                 chapter03/chapter03.xml
 
-        $(Q)xsltproc --xinclude --nonet         \
+        $(Q)xsltproc --nonet                     \
                 --output $(BASEDIR)/md5sums \
                 stylesheets/md5sum.xsl      \