From 36ad069a1ad93c6986d9d587e3897e0b60ba3bbe Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Fri, 13 Jul 2001 17:33:51 +0000 Subject: [PATCH] Simplified make clean by using GNUSTEP_OBJ_DIR git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@10476 72102866-910b-0410-8b05-ffd578937521 --- application.make | 12 +++++------- gswapp.make | 6 +----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/application.make b/application.make index f2fc56ec..7f3781aa 100644 --- a/application.make +++ b/application.make @@ -52,12 +52,14 @@ ifeq ($(profile), yes) APP_EXTENSION = profile else ifeq ($(debug), yes) - APP_EXTENSION=debug + APP_EXTENSION = debug else - APP_EXTENSION=app + APP_EXTENSION = app endif endif +$(warning APP_EXTENSION is $(APP_EXTENSION)) + ifeq ($(INTERNAL_app_NAME),) # This part gets included by the first invoked make process. internal-all:: $(APP_NAME:=.all.app.variables) @@ -67,11 +69,7 @@ internal-install:: $(APP_NAME:=.install.app.variables) internal-uninstall:: $(APP_NAME:=.uninstall.app.variables) internal-clean:: $(APP_NAME:=.clean.app.subprojects) -ifeq ($(GNUSTEP_FLATTENED),) - rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_LDIR) -else - rm -rf $(GNUSTEP_OBJ_PREFIX) -endif + rm -rf $(GNUSTEP_OBJ_DIR) ifeq ($(OBJC_COMPILER), NeXT) rm -f *.iconheader for f in *.$(APP_EXTENSION); do \ diff --git a/gswapp.make b/gswapp.make index 15921323..5cded9c3 100644 --- a/gswapp.make +++ b/gswapp.make @@ -70,11 +70,7 @@ internal-install:: $(GSWAPP_NAME:=.install.gswapp.variables) internal-uninstall:: $(GSWAPP_NAME:=.uninstall.gswapp.variables) internal-clean:: $(GSWAPP_NAME:=.clean.gswapp.subprojects) -ifeq ($(GNUSTEP_FLATTENED),) - rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_LDIR) -else - rm -rf $(GNUSTEP_OBJ_PREFIX) -endif + rm -rf $(GNUSTEP_OBJ_DIR) ifeq ($(OBJC_COMPILER), NeXT) rm -f *.iconheader for f in *.$(GSWAPP_EXTENSION); do \