diff --git a/Master/application.make b/Master/application.make index a3f1c9ea..bc333591 100644 --- a/Master/application.make +++ b/Master/application.make @@ -43,17 +43,20 @@ _PLIST_INFO_FILES = $(addsuffix Info.plist,$(foreach app,$(APP_NAME),$(patsubst internal-clean:: ifeq ($(GNUSTEP_FLATTENED),) - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - $(_PLIST_INFO_FILES) *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + $(_PLIST_INFO_FILES) *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR)) else - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - $(_PLIST_INFO_FILES) *.$(APP_EXTENSION) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + $(_PLIST_INFO_FILES) *.$(APP_EXTENSION)) endif internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj *.app *.debug *.profile + static_profile_debug_obj *.app *.debug *.profile) # The following make trick extracts all tools in APP_NAME for which # the xxx_SUBPROJECTS variable is set to something non-empty. @@ -73,5 +76,7 @@ endif internal-strings:: $(APP_NAME:=.strings.app.variables) +# FIXME - GNUSTEP_BUILD_DIR here. Btw should we remove this or +# provide a better more general way of doing it ? $(APP_NAME): @$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.app.variables diff --git a/Master/bundle.make b/Master/bundle.make index 2e918626..8c4f7d9f 100644 --- a/Master/bundle.make +++ b/Master/bundle.make @@ -37,13 +37,15 @@ _PSWRAP_C_FILES = $(foreach bundle,$(BUNDLE_NAME),$($(bundle)_PSWRAP_FILES:.psw= _PSWRAP_H_FILES = $(foreach bundle,$(BUNDLE_NAME),$($(bundle)_PSWRAP_FILES:.psw=.h)) internal-clean:: - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - $(addsuffix $(BUNDLE_EXTENSION),$(BUNDLE_NAME)) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + $(addsuffix $(BUNDLE_EXTENSION),$(BUNDLE_NAME))) internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) BUNDLES_WITH_SUBPROJECTS = $(strip $(foreach bundle,$(BUNDLE_NAME),$(patsubst %,$(bundle),$($(bundle)_SUBPROJECTS)))) diff --git a/Master/clibrary.make b/Master/clibrary.make index 2b5b21b6..82fe119b 100644 --- a/Master/clibrary.make +++ b/Master/clibrary.make @@ -37,12 +37,14 @@ _PSWRAP_C_FILES = $(foreach lib,$(CLIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.c)) _PSWRAP_H_FILES = $(foreach lib,$(CLIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.h)) internal-clean:: - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES)) internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) CLIBRARIES_WITH_SUBPROJECTS = $(strip $(foreach clibrary,$(CLIBRARY_NAME),$(patsubst %,$(clibrary),$($(clibrary)_SUBPROJECTS)))) ifneq ($(CLIBRARIES_WITH_SUBPROJECTS),) diff --git a/Master/ctool.make b/Master/ctool.make index d064e80b..7dfbdc65 100644 --- a/Master/ctool.make +++ b/Master/ctool.make @@ -36,9 +36,10 @@ internal-clean:: rm -rf $(GNUSTEP_OBJ_DIR) internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) CTOOLS_WITH_SUBPROJECTS = $(strip $(foreach ctool,$(CTOOL_NAME),$(patsubst %,$(ctool),$($(ctool)_SUBPROJECTS)))) ifneq ($(CTOOLS_WITH_SUBPROJECTS),) diff --git a/Master/gswapp.make b/Master/gswapp.make index 600303ab..f0782745 100644 --- a/Master/gswapp.make +++ b/Master/gswapp.make @@ -47,15 +47,19 @@ internal-uninstall:: $(GSWAPP_NAME:=.uninstall.gswapp.variables) internal-clean:: ifeq ($(GNUSTEP_FLATTENED),) - rm -rf $(GNUSTEP_OBJ_DIR) *.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_LDIR) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) \ + *.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_LDIR)) else - rm -rf $(GNUSTEP_OBJ_DIR) *.$(GSWAPP_EXTENSION) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) *.$(GSWAPP_EXTENSION)) endif internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj *.gswa *.debug *.profile + static_profile_debug_obj *.gswa *.debug *.profile) GSWAPPS_WITH_SUBPROJECTS = $(strip $(foreach gswapp,$(GSWAPP_NAME),$(patsubst %,$(gswapp),$($(gswapp)_SUBPROJECTS)))) ifneq ($(GSWAPPS_WITH_SUBPROJECTS),) diff --git a/Master/gswbundle.make b/Master/gswbundle.make index 3b203445..bb2c33a2 100644 --- a/Master/gswbundle.make +++ b/Master/gswbundle.make @@ -38,13 +38,15 @@ internal-install:: $(GSWBUNDLE_NAME:=.install.gswbundle.variables) internal-uninstall:: $(GSWBUNDLE_NAME:=.uninstall.gswbundle.variables) internal-clean:: - rm -rf $(GNUSTEP_OBJ_DIR) \ - $(addsuffix $(GSWBUNDLE_EXTENSION),$(GSWBUNDLE_NAME)) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) \ + $(addsuffix $(GSWBUNDLE_EXTENSION),$(GSWBUNDLE_NAME))) internal-distclean:: + (CD $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) GSWBUNDLES_WITH_SUBPROJECTS = $(strip $(foreach gswbundle,$(GSWBUNDLE_NAME),$(patsubst %,$(gswbundle),$($(gswbundle)_SUBPROJECTS)))) ifneq ($(GSWBUNDLES_WITH_SUBPROJECTS),) diff --git a/Master/library.make b/Master/library.make index 47d1a0e2..6dac2412 100644 --- a/Master/library.make +++ b/Master/library.make @@ -37,12 +37,14 @@ _PSWRAP_C_FILES = $(foreach lib,$(LIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.c)) _PSWRAP_H_FILES = $(foreach lib,$(LIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.h)) internal-clean:: - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES)) internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) LIBRARIES_WITH_SUBPROJECTS = $(strip $(foreach library,$(LIBRARY_NAME),$(patsubst %,$(library),$($(library)_SUBPROJECTS)))) ifneq ($(LIBRARIES_WITH_SUBPROJECTS),) diff --git a/Master/objc.make b/Master/objc.make index 9c184070..e81640ef 100644 --- a/Master/objc.make +++ b/Master/objc.make @@ -36,9 +36,10 @@ internal-clean:: rm -rf $(GNUSTEP_OBJ_DIR) internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) OBJC_PROGRAMS_WITH_SUBPROJECTS = $(strip $(foreach objc_program,$(OBJC_PROGRAM_NAME),$(patsubst %,$(objc_program),$($(objc_program)_SUBPROJECTS)))) ifneq ($(OBJC_PROGRAMS_WITH_SUBPROJECTS),) diff --git a/Master/palette.make b/Master/palette.make index cea372e6..4cb4fd2e 100644 --- a/Master/palette.make +++ b/Master/palette.make @@ -39,17 +39,20 @@ _PSWRAP_H_FILES = $(foreach palette,$(PALETTE_NAME),$($(palette)_PSWRAP_FILES:.p internal-clean:: ifeq ($(GNUSTEP_FLATTENED),) - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - *.palette/$(GNUSTEP_TARGET_LDIR) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + *.palette/$(GNUSTEP_TARGET_LDIR)) else - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - *.palette + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + *.palette) endif internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj *.palette + static_profile_debug_obj *.palette) PALETTES_WITH_SUBPROJECTS = $(strip $(foreach palette,$(PALETTE_NAME),$(patsubst %,$(palette),$($(palette)_SUBPROJECTS)))) ifneq ($(PALETTES_WITH_SUBPROJECTS),) diff --git a/Master/service.make b/Master/service.make index c0f10203..ed558455 100644 --- a/Master/service.make +++ b/Master/service.make @@ -38,17 +38,20 @@ _PSWRAP_H_FILES = $(foreach service,$(SERVICE_NAME),$($(service)_PSWRAP_FILES:.p internal-clean:: ifeq ($(GNUSTEP_FLATTENED),) - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - *.service/$(GNUSTEP_TARGET_LDIR) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + *.service/$(GNUSTEP_TARGET_LDIR)) else - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - *.service + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + *.service) endif internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj *.service + static_profile_debug_obj *.service) SERVICES_WITH_SUBPROJECTS = $(strip $(foreach service,$(SERVICE_NAME),$(patsubst %,$(service),$($(service)_SUBPROJECTS)))) ifneq ($(SERVICES_WITH_SUBPROJECTS),) diff --git a/Master/subproject.make b/Master/subproject.make index 0f83bbc8..62292064 100644 --- a/Master/subproject.make +++ b/Master/subproject.make @@ -52,12 +52,14 @@ _PSWRAP_C_FILES = $($(SUBPROJECT_NAME)_PSWRAP_FILES:.psw=.c) _PSWRAP_H_FILES = $($(SUBPROJECT_NAME)_PSWRAP_FILES:.psw=.h) internal-clean:: - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES)) internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) SUBPROJECTS_WITH_SUBPROJECTS = $(strip $(patsubst %,$(SUBPROJECT_NAME),$($(SUBPROJECT_NAME)_SUBPROJECTS))) ifneq ($(SUBPROJECTS_WITH_SUBPROJECTS),) diff --git a/Master/test-application.make b/Master/test-application.make index 1299fe58..048f8a33 100644 --- a/Master/test-application.make +++ b/Master/test-application.make @@ -34,17 +34,20 @@ _PSWRAP_H_FILES = $(foreach app,$(TEST_APP_NAME),$($(app)_PSWRAP_FILES:.psw=.h)) internal-clean:: ifeq ($(GNUSTEP_FLATTENED),) - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR)) else - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ - *.$(APP_EXTENSION) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) \ + *.$(APP_EXTENSION)) endif internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj *.app *.debug *.profile + static_profile_debug_obj *.app *.debug *.profile) TEST_APPS_WITH_SUBPROJECTS = $(strip $(foreach test-app,$(TEST_APP_NAME),$(patsubst %,$(test-app),$($(test-app)_SUBPROJECTS)))) ifneq ($(TEST_APPS_WITH_SUBPROJECTS),) diff --git a/Master/test-library.make b/Master/test-library.make index ca160e60..a80c8ff4 100644 --- a/Master/test-library.make +++ b/Master/test-library.make @@ -37,12 +37,14 @@ _PSWRAP_C_FILES = $(foreach lib,$(TEST_LIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw= _PSWRAP_H_FILES = $(foreach lib,$(TEST_LIBRARY_NAME),$($(lib)_PSWRAP_FILES:.psw=.h)) internal-clean:: - rm -rf $(GNUSTEP_OBJ_DIR) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) + (cd $(GNUSTEP_BUILD_DIR); \ + rm -rf $(GNUSTEP_OBJ_DIR_NAME) $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES)) internal-distclean:: + (cd $(GNUSTEP_BUILD_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) TEST_LIBRARIES_WITH_SUBPROJECTS = $(strip $(foreach test-library,$(TEST_LIBRARY_NAME),$(patsubst %,$(test-library),$($(test-library)_SUBPROJECTS)))) ifneq ($(TEST_LIBRARIES_WITH_SUBPROJECTS),) diff --git a/Master/test-tool.make b/Master/test-tool.make index ba23f22f..f6de544e 100644 --- a/Master/test-tool.make +++ b/Master/test-tool.make @@ -32,9 +32,10 @@ internal-clean:: rm -rf $(GNUSTEP_OBJ_DIR) internal-distclean:: + (cd $(GNUSTEP_OBJ_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) TEST_TOOLS_WITH_SUBPROJECTS = $(strip $(foreach test-tool,$(TEST_TOOL_NAME),$(patsubst %,$(test-tool),$($(test-tool)_SUBPROJECTS)))) ifneq ($(TEST_TOOLS_WITH_SUBPROJECTS),) diff --git a/Master/tool.make b/Master/tool.make index 3f754f8b..c4fba005 100644 --- a/Master/tool.make +++ b/Master/tool.make @@ -36,9 +36,10 @@ internal-clean:: rm -rf $(GNUSTEP_OBJ_DIR) internal-distclean:: + (cd $(GNUSTEP_OBJ_DIR); \ rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \ static_debug_obj static_profile_obj shared_profile_debug_obj \ - static_profile_debug_obj + static_profile_debug_obj) TOOLS_WITH_SUBPROJECTS = $(strip $(foreach tool,$(TOOL_NAME),$(patsubst %,$(tool),$($(tool)_SUBPROJECTS)))) ifneq ($(TOOLS_WITH_SUBPROJECTS),)