mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-24 17:23:36 +02:00
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 <jan@janware.com>
This commit is contained in:
parent
494d5d29d6
commit
19d0397b34
1 changed files with 1 additions and 17 deletions
|
|
@ -1,21 +1,9 @@
|
||||||
# generic utility modules
|
|
||||||
# (c) 2001 jannet it services
|
|
||||||
# contact@jannet.de
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
TOPDIR = ..
|
TOPDIR = ..
|
||||||
|
|
||||||
CACHED_FILES := defs.mk projects.mk platform.mk Makefile
|
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 $(TOPDIR)/make/proj.mk
|
||||||
include $(JWBDIR)/make/make.mk
|
include $(JWBDIR)/make/make.mk
|
||||||
|
|
||||||
ifneq ($(MAKECMDGOALS),install-links)
|
ifneq ($(MAKECMDGOALS),install-links)
|
||||||
ifneq ($(MAKECMDGOALS),do-install-links)
|
ifneq ($(MAKECMDGOALS),do-install-links)
|
||||||
include $(JWBDIR)/make/dirs.mk
|
include $(JWBDIR)/make/dirs.mk
|
||||||
|
|
@ -23,7 +11,6 @@ ifneq ($(MAKECMDGOALS),install-links)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(JWBDIR)/make/dev-utils.mk
|
include $(JWBDIR)/make/dev-utils.mk
|
||||||
#include $(JWBDIR)/make/cache.mk
|
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
|
||||||
|
|
@ -33,6 +20,3 @@ endif
|
||||||
|
|
||||||
grep-vars:
|
grep-vars:
|
||||||
@sed '/^ *[A-Z]/!d; s/^[ ]*//g; s/[=+?:].*//g; s/[ ]*//g' *.mk | sort -u
|
@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
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue