Changeset 5247008

Timestamp:

01/11/2023 02:19:04 PM (16 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

bcd84ba4

Parents:

a04cf4b

Message:

Makefile: refactor "version" target

Makefile's use files for their dependency calculations. Since
git-version.sh generates files (version.ent and conditional.ent)
use version.ent to see whether git-version.sh has been run.

The only target that should depend on version.ent is then
$(BLFS_FULL) since all other targets depend (directly or indirectly
on this one).

version.ent itself depends on any change made to xml files, xsl files,
packages.ent, general.ent. We could add more (Makefile, gnome.ent, some
scripts), but let's see whether we really want it.

File:

• Makefile (modified) (9 diffs)

Makefile

@@ -103 +103 @@
 
 html: $(BASEDIR)/index.html
-$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML) version
+$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML)
         @echo "Generating chunked XHTML files..."
         $(Q)xsltproc --nonet                                    \
@@ -137 +137 @@
 
 nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML) version
+$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML)
         @echo "Generating non-chunked XHTML file..."
         $(Q)xsltproc --nonet                                \
@@ -160 +160 @@
 
 validate: $(RENDERTMP)/$(BLFSFULL)
-$(RENDERTMP)/$(BLFSFULL): general.ent packages.ent $(ALLXML) $(ALLXSL) version
+$(RENDERTMP)/$(BLFSFULL): version.ent
         $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
 
@@ -179 +179 @@
 
 profile-html: $(RENDERTMP)/$(BLFSHTML)
-$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL) version
+$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL)
         @echo "Generating profiled XML for XHTML..."
         $(Q)xsltproc --nonet                              \
@@ -192 +192 @@
           blfs-patches.sh > blfs-patch-list
 
-blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL) version
+blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL)
         @echo "Generating blfs patch script..."
         $(Q)xsltproc --nonet                     \
@@ -200 +200 @@
 
 wget-list: $(BASEDIR)/wget-list
-$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL) version
+$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL)
         @echo "Generating wget list for $(REV) at $(BASEDIR)/wget-list ..."
         $(Q)mkdir -p $(BASEDIR)
@@ -209 +209 @@
 
 test-links: $(BASEDIR)/test-links
-$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL) version
+$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL)
         @echo "Generating test-links file..."
         $(Q)mkdir -p $(BASEDIR)
@@ -261 +261 @@
 
 dump-commands: $(DUMPDIR)
-$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL) version
+$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL)
         @echo "Dumping book commands..."
         $(Q)xsltproc --output $(DUMPDIR)/          \
@@ -270 +270 @@
 .PHONY: blfs all world html nochunks tmpdir clean  \
    validate profile-html blfs-patch-list wget-list test-links \
-   dump-commands  bootscripts systemd-units version
-
-version:
+   dump-commands  bootscripts systemd-units
+
+version.ent: general.ent packages.ent $(ALLXML) $(ALLXSL)
         $(Q)./git-version.sh $(REV)