From 19d0397b3450ae36a592910389fd710cf3cdc717 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 22 Jan 2026 14:19:46 +0100 Subject: [PATCH] make/Makefile: Remove cruft + CACHED_VARS Remove unused code, and code which actually does something: CACHED_VARS looks as if it's sufficently and more centrally defined in make.mk, don't override that. Signed-off-by: Jan Lindemann --- make/Makefile | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/make/Makefile b/make/Makefile index 8cae29ee..cb3022fd 100644 --- a/make/Makefile +++ b/make/Makefile @@ -1,21 +1,9 @@ -# generic utility modules -# (c) 2001 jannet it services -# contact@jannet.de -# $Id$ - TOPDIR = .. - CACHED_FILES := defs.mk projects.mk platform.mk Makefile -#CACHED_VARS = $(shell sed '/^[ \t]*\([A-Z_]\+\) *\(.=\).*$$.shell/!d; s/ *.=.*//' $(CACHED_FILES)) -CACHED_VARS := WHICH PYTHON ECHO TEST BROWSER SED RM PWD ID CUT TR \ - AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION \ - OS_NAME CAT BIN_INSTALL SUDO -#CACHED_VARS += TARGET_ARCH RPM_ARCH -#CACHED_VARS += TARGET_ARCH -#CACHED_VARS += DEVELOPMENT include $(TOPDIR)/make/proj.mk include $(JWBDIR)/make/make.mk + ifneq ($(MAKECMDGOALS),install-links) ifneq ($(MAKECMDGOALS),do-install-links) include $(JWBDIR)/make/dirs.mk @@ -23,7 +11,6 @@ ifneq ($(MAKECMDGOALS),install-links) endif include $(JWBDIR)/make/dev-utils.mk -#include $(JWBDIR)/make/cache.mk all: @@ -33,6 +20,3 @@ endif grep-vars: @sed '/^ *[A-Z]/!d; s/^[ ]*//g; s/[=+?:].*//g; s/[ ]*//g' *.mk | sort -u - -$(INSTALL_MAKEDIR)/%.tmpl: %.tmpl $(TOPDIR)/dir_install_MAKE.done - $(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) $< $@A