From c89ed3f2e8bc15b10e32da622b068a7363c0739b Mon Sep 17 00:00:00 2001 From: ayers Date: Sun, 9 Nov 2003 18:10:39 +0000 Subject: [PATCH] * GSWeb.framework/GNUmakefile * GSWExtensions.framework/GNUmakefile * GSWExtensionsGSW.framework/GNUmakefile: Update for GNUSTEP_BUILD_DIR changes in -make. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18069 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ GSWExtensions.framework/GNUmakefile | 4 ++-- GSWExtensionsGSW.framework/GNUmakefile | 4 ++-- GSWeb.framework/GNUmakefile | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f44a7f1..c17f4d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-11-09 David Ayers + + * GSWeb.framework/GNUmakefile + * GSWExtensions.framework/GNUmakefile + * GSWExtensionsGSW.framework/GNUmakefile: Update for + GNUSTEP_BUILD_DIR changes in -make. + 2003-10-22 David Ayers * GSWeb.framework/GSWAssociation.m: Include limits.h and float.h diff --git a/GSWExtensions.framework/GNUmakefile b/GSWExtensions.framework/GNUmakefile index 3c981c6..c6c7536 100644 --- a/GSWExtensions.framework/GNUmakefile +++ b/GSWExtensions.framework/GNUmakefile @@ -45,9 +45,9 @@ ifeq ($(gswnames), all) FRAMEWORK_NAME = GSWExtensions GSWExtensions_wo endif -# Ensure that each framework uses its own GNUSTEP_OBJ_DIR & DERIVED_SRC +# Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC ifneq ($(GNUSTEP_INSTANCE),) -GNUSTEP_OBJ_DIR := $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE) +GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE) DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE) endif diff --git a/GSWExtensionsGSW.framework/GNUmakefile b/GSWExtensionsGSW.framework/GNUmakefile index dd4a7ee..94bb574 100644 --- a/GSWExtensionsGSW.framework/GNUmakefile +++ b/GSWExtensionsGSW.framework/GNUmakefile @@ -45,9 +45,9 @@ ifeq ($(gswnames), all) FRAMEWORK_NAME = GSWExtensionsGSW GSWExtensionsGSW_wo endif -# Ensure that each framework uses its own GNUSTEP_OBJ_DIR & DERIVED_SRC +# Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC ifneq ($(GNUSTEP_INSTANCE),) -GNUSTEP_OBJ_DIR := $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE) +GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE) DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE) endif diff --git a/GSWeb.framework/GNUmakefile b/GSWeb.framework/GNUmakefile index 2ca757e..df6c35e 100644 --- a/GSWeb.framework/GNUmakefile +++ b/GSWeb.framework/GNUmakefile @@ -47,9 +47,9 @@ ifeq ($(gswnames), all) FRAMEWORK_NAME = GSWeb GSWeb_wo endif -# Ensure that each framework uses its own GNUSTEP_OBJ_DIR & DERIVED_SRC +# Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC ifneq ($(GNUSTEP_INSTANCE),) -GNUSTEP_OBJ_DIR := $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE) +GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE) DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE) endif