Changeset f756851

Timestamp:

11/09/2021 08:11:58 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

2b3edd2

Parents:

e25788e

Message:

BLFS tools: do not needlessly validate book

With the current Makefile, git-version.sh is run unconditionally,
so that the bok is validated each time, even if there is no
text change. Change this to only validate if there is a text change
(the previous behavior), and run git-version.sh just before validation.

File:

• BLFS/Makefile (modified) (3 diffs)

BLFS/Makefile

@@ -148 +148 @@
 $(LFS_FULL): FORCE
 endif
-$(LFS_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS) lfs-version
+$(LFS_FULL): $(LFS_XML) $(LFS_XML)/general.ent $(ALLXMLLFS) $(ALLXSLLFS)
+        $(Q)cd $(LFS_XML) && if [ -x git-version.sh ] ; then \
+             echo "Processing LFS version..."; \
+             ./git-version.sh $(REV); \
+        fi
         @echo "Processing LFS bootscripts..."
         $(Q)cd $(LFS_XML) && bash process-scripts.sh
@@ -165 +169 @@
         $(Q)echo $(REV) > $(REVFILE)
 
-$(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL) version
+$(BLFS_FULL): $(BLFS_XML) $(BLFS_XML)/general.ent $(ALLXML) $(ALLXSL)
+        $(Q)cd $(BLFS_XML) && if [ -x git-version.sh ] ; then \
+             echo "Processing BLFS version..."; \
+             ./git-version.sh $(REV); \
+        fi
         $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
         @echo "Adjusting BLFS for revision $(REV)..."
@@ -209 +217 @@
         fi
 
-# Generate BLFS version from git:
-version:
-        $(Q)cd $(BLFS_XML) && if [ -x git-version.sh ] ; then \
-             ./git-version.sh $(REV); \
-        fi
-
-lfs-version:
-        $(Q)cd $(LFS_XML) && if [ -x git-version.sh ] ; then \
-             ./git-version.sh $(REV); \
-        fi
-
 # Clean up