diff --git a/make/Makefile b/make/Makefile index ab1bd9ad..b0e0de9b 100644 --- a/make/Makefile +++ b/make/Makefile @@ -1,5 +1,6 @@ TOPDIR = .. CACHED_FILES := defs.mk projects.mk platform.mk Makefile +MKFILES += $(CACHE_PROJECTS_MK) include $(TOPDIR)/make/proj.mk include $(JWBDIR)/make/make.mk @@ -21,3 +22,10 @@ endif grep-vars: $(Q)sed '/^ *[A-Z]/!d; s/^[ ]*//g; s/[=+?:].*//g; s/[ ]*//g' *.mk | sort -u + +cache-projects: $(CACHE_PROJECTS_MK) +clean-cache-projects: + rm -f $(CACHE_PROJECTS_MK) +$(CACHE_PROJECTS_MK): $(CACHE_PROJECT_MK) + sed '/\($(subst $(space),\|,$(CACHED_VARS_ONLY_PROJECT))\)\s*[:?]\?=/ d' $< > $@.tmp + mv $@.tmp $@ diff --git a/make/cache.mk b/make/cache.mk index 58731542..8ea15f55 100644 --- a/make/cache.mk +++ b/make/cache.mk @@ -4,8 +4,6 @@ .PHONY: cache clean-cache clean-cache-projects CACHE_PROJECT_MK ?= .cache-project.mk -CACHE_PROJECTS_MK ?= .cache-projects.mk -CACHE_FILES_MK = $(CACHE_PROJECT_MK) $(CACHE_PROJECTS_MK) CACHED_VARS_ONLY_PROJECT ?= \ PROJECT \ PREREQ \ @@ -29,11 +27,3 @@ $(CACHE_PROJECT_MK): $(CACHED_FILES) $(JWBDIR)/make/cache.mk $(GREP) . | \ tee $@.tmp mv $@.tmp $@ - -# -- Only used in jw-pkg -cache-projects: $(CACHE_PROJECTS_MK) -clean-cache-projects: - rm -f $(CACHE_PROJECTS_MK) -$(CACHE_PROJECTS_MK): $(CACHE_PROJECT_MK) - sed '/\($(subst $(space),\|,$(CACHED_VARS_ONLY_PROJECT))\)\s*[:?]\?=/ d' $< > $@.tmp - mv $@.tmp $@ diff --git a/make/platform.mk b/make/platform.mk index 079f88bb..2d79e0c0 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -10,7 +10,9 @@ define try_include endif endef -$(eval $(call try_include,$(JWBDIR)/make/.cache-projects.mk)) +CACHE_PROJECTS_MK := $(JWBDIR)/cache-projects.mk + +$(eval $(call try_include,$(CACHE_PROJECTS_MK))) $(eval $(call try_include,$(TOPDIR)/make/.cache-project.mk)) $(eval $(call try_include,$(JWBDIR)/make/pre-local.mk)) $(eval $(call try_include,$(TOPDIR)/make/pre-local.mk)) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 03aac5b8..d842db80 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -140,8 +140,7 @@ pkg-update: pkgupdate.dist pkg-upload-local: pkg-upload-local.dist clean.rpm: - $(RM) -rf $(DIST_DIR) *.dist make/.cache-project.mk make/.cache-projects.mk - + $(RM) -rf $(DIST_DIR) *.dist make/.cache-project.mk #ifeq ($(PROJECT_DESCR_FILE),) # #clean.mkspec: