Added empty rules for config files and .PHONY declarations for frameworks

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23556 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-09-19 00:45:34 +00:00
parent 47935ebffe
commit 239fd6fdd1
4 changed files with 48 additions and 9 deletions

View file

@ -1,3 +1,15 @@
2006-09-19 Nicola Pero <nicola.pero@meta-innovation.com>
* rules.make (GNUSTEP_CONFIG_FILE, GNUSTEP_USER_CONFIG_FILE):
Added empty rules to prevent make wasting time trying to rebuild
config files using implicit rules.
* Master/rules.make (.PHONY): Added build-headers,
before-build-headers, after-build-headers.
* Instance/framework.make (.PHONY): Added declaration of
phony targets.
2006-09-19 Nicola Pero <nicola.pero@meta-innovation.com>
* rules.make (config.make): Fixed syntax error in conditional that

View file

@ -24,7 +24,15 @@ ifeq ($(RULES_MAKE_LOADED),)
include $(GNUSTEP_MAKEFILES)/rules.make
endif
# FIXME - missing .PHONY declaration
.PHONY: internal-framework-all_ \
build-framework \
internal-framework-build-headers \
build-framework-dirs \
update-current-symlink \
internal-framework-install_ \
internal-framework-distclean \
internal-framework-clean \
internal-framework-uninstall_
# The name of the framework is in the FRAMEWORK_NAME variable.
# The list of framework resource files are in xxx_RESOURCE_FILES

View file

@ -183,14 +183,16 @@ after-strings::
# declare targets as PHONY
.PHONY: all before-all internal-all after-all \
install before-install internal-install after-install \
internal-after-install \
uninstall before-uninstall internal-uninstall after-uninstall \
clean before-clean internal-clean after-clean \
distclean before-distclean internal-distclean after-distclean \
check before-check internal-check after-check \
strings before-strings internal-strings after-strings
.PHONY: \
all before-all internal-all after-all \
install before-install internal-install after-install \
internal-after-install \
uninstall before-uninstall internal-uninstall after-uninstall \
clean before-clean internal-clean after-clean \
distclean before-distclean internal-distclean after-distclean \
check before-check internal-check after-check \
strings before-strings internal-strings after-strings \
build-headers before-build-headers after-build-headers
# Prevent make from trying to remove stuff like
# libcool.library.all.subprojects thinking that it is a temporary file

View file

@ -564,6 +564,23 @@ $(GNUSTEP_MAKEFILES)/Instance/Shared/*.make: ;
$(GNUSTEP_MAKEFILES)/Instance/Documentation/*.make: ;
# Rules to stop 'make' from wasting time trying to rebuild the config
# files from implicit rules.
$(GNUSTEP_CONFIG_FILE): ;
ifneq ($(GNUSTEP_USER_CONFIG_FILE),)
# FIXME - Checking for relative vs. absolute paths!
ifneq ($(filter /%, $(GNUSTEP_USER_CONFIG_FILE)),)
# Path starts with '/', consider it absolute
$(GNUSTEP_USER_CONFIG_FILE): ;
else
# Path does no start with '/', try it as relative
$(GNUSTEP_HOME)/$(GNUSTEP_USER_CONFIG_FILE): ;
endif
endif
# The rule to create the GNUSTEP_BUILD_DIR if any.
ifneq ($(GNUSTEP_BUILD_DIR),.)
$(GNUSTEP_BUILD_DIR):