gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Resources directories for tools and subprojects on clean, not distclean; create them in GNUSTEP_BUILD_DIR

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23561 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-09-19 01:59:55 +00:00
parent abedf4ab4d
commit 2484f77386
5 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2006-09-19 Nicola Pero <nicola.pero@meta-innovation.com>
* Master/subproject.make (internal-distclean): Do nothing.
(internal-clean): Remove 'Resources' directory on 'clean' too.
* Master/tool.make (internal-distclean): Do nothing.
(internal-clean): Removed 'Resources' directory on 'clean'.
* Instance/subproject.make (GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH):
Added GNUSTEP_BUILD_DIR.
* Instance/tool.make (GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH): Added
GNUSTEP_BUILD_DIR.
* Master/subproject.make (.PHONY): Removed build-headers.
2006-09-19 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/framework.make (UPDATE_CURRENT_SYMLINK_RULE): Removed

3
Instance/subproject.make
View file

@ -60,7 +60,6 @@ internal-subproject-build-headers:: $(OWNING_PROJECT_HEADER_FILES)
# has built his dirs
$(OWNING_PROJECT_HEADER_DIR)/%.h: %.h $(OWNING_PROJECT_HEADER_DIR)
$(ECHO_NOTHING)$(INSTALL_DATA) $< $@$(END_ECHO)
$(OWNING_PROJECT_HEADER_DIR):
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
@ -95,7 +94,7 @@ endif # no FRAMEWORK
#
ifeq ($($(GNUSTEP_INSTANCE)_HAS_RESOURCE_BUNDLE), yes)
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = Resources/Subproject
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(GNUSTEP_BUILD_DIR)/Resources/Subproject
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
# Only build, not install

2
Instance/tool.make
View file

@ -103,7 +103,7 @@ internal-tool-uninstall_::
ifeq ($($(GNUSTEP_INSTANCE)_HAS_RESOURCE_BUNDLE),yes)
# Include the rules to build resource bundles
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = Resources/$(GNUSTEP_INSTANCE)
GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(GNUSTEP_BUILD_DIR)/Resources/$(GNUSTEP_INSTANCE)
GNUSTEP_SHARED_BUNDLE_MAIN_PATH = Resources/$(GNUSTEP_INSTANCE)
GNUSTEP_SHARED_BUNDLE_INSTALL_DIR = $(TOOL_INSTALL_DIR)
include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make

12
Master/subproject.make
View file

@ -39,7 +39,6 @@ $(warning Ignoring all subprojects and building only $(SUBPROJECT_NAME))
endif
.PHONY: build-headers
build-headers:: $(SUBPROJECT_NAME:=.build-headers.subproject.variables)
internal-all:: $(SUBPROJECT_NAME:=.all.subproject.variables)
@ -52,26 +51,19 @@ _PSWRAP_C_FILES = $($(SUBPROJECT_NAME)_PSWRAP_FILES:.psw=.c)
_PSWRAP_H_FILES = $($(SUBPROJECT_NAME)_PSWRAP_FILES:.psw=.h)
internal-clean::
ifneq ($(_PSWRAP_C_FILES)$(_PSWRAP_H_FILES),)
ifneq ($(_PSWRAP_C_FILES)$(_PSWRAP_H_FILES)$($(SUBPROJECT_NAME)_HAS_RESOURCE_BUNDLE),)
(cd $(GNUSTEP_BUILD_DIR); \
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES))
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) Resources)
endif
internal-distclean::
SUBPROJECTS_WITH_SUBPROJECTS = $(strip $(patsubst %,$(SUBPROJECT_NAME),$($(SUBPROJECT_NAME)_SUBPROJECTS)))
ifneq ($(SUBPROJECTS_WITH_SUBPROJECTS),)
internal-clean:: $(SUBPROJECTS_WITH_SUBPROJECTS:=.clean.subproject.subprojects)
internal-distclean:: $(SUBPROJECTS_WITH_SUBPROJECTS:=.distclean.subproject.subprojects)
endif
# If the subproject has a resource bundle, destroy it on distclean
ifeq ($($(SUBPROJECT_NAME)_HAS_RESOURCE_BUNDLE), yes)
internal-distclean::
rm -rf Resources
endif
internal-strings:: $(SUBPROJECT_NAME:=.strings.subproject.variables)
$(SUBPROJECT_NAME):

4
Master/tool.make
View file

@ -48,8 +48,8 @@ endif
TOOLS_WITH_RESOURCE_BUNDLES = $(strip $(foreach tool,$(TOOL_NAME),$($(tool)_HAS_RESOURCE_BUNDLE:yes=$(tool))))
ifneq ($(TOOLS_WITH_RESOURCE_BUNDLES),)
internal-distclean::
rm -rf Resources
internal-clean::
rm -rf $(GNUSTEP_BUILD_DIR)/Resources
endif
internal-strings:: $(TOOL_NAME:=.strings.tool.variables)