Changeset 05d5b11

Timestamp:

01/25/2023 01:51:58 AM (15 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

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

Children:

4653242

Parents:

f6065b49

Message:

Revert "Makefile: use a "by-the-book" way to detect build environment change"

This reverts commit 41275f9aac1da83ff3aef848eafa2a2a97257565.

Files:

• .gitignore (modified) (1 diff)
• Makefile (modified) (3 diffs)

.gitignore

@@ -4 +4 @@
 xxx
 *.swp
-build-env

Makefile

@@ -34 +34 @@
   endif
 endif
+
+# Let's get the previous REV: it'll be used to see if we should
+# rebuild version.ent
+PREVREV != if [ -f conditional.ent ]; then \
+              gawk '/INCLUDE/{ print $$3 }' conditional.ent; \
+           fi
 
 ifeq ($(REV), sysv)
@@ -274 +280 @@
         test-links dump-commands  bootscripts systemd-units
 
-version.ent: general.ent packages.ent gnome.ent $(ALLXML) $(ALLXSL) build-env
+# make version.ent unconditionally if we have changed REV
+ifneq ($(REV), $(PREVREV))
+   .PHONY: version.ent
+endif
+
+version.ent: general.ent packages.ent gnome.ent $(ALLXML) $(ALLXSL)
         $(Q)./git-version.sh $(REV)
 
@@ -299 +310 @@
 #                general/prog/python-modules.xml
 #       $(Q)mv temp.xml $@
-
-.PHONY: update-build-env
-update-build-env:
-        $(Q)echo REV=$(REV) > $@.new
-        $(Q)echo BASEDIR=$(BASEDIR) >> $@.new
-        $(Q)diff $@.new $@ 2>/dev/null >/dev/null || mv $@.new $@
-        $(Q)rm -f $@.new
-
-build-env: update-build-env