From 5512cbb40736b06209bd995a033654fc01cfd113 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Sun, 20 Jan 2002 02:26:58 +0000 Subject: [PATCH] Further simplification of common.make code git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12139 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 9 +++++++++ common.make | 47 ++++++++++++++++++++--------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3a2d59b..a972f428 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sun Jan 20 00:19:05 2002 Nicola Pero + + * common.make: Removed GNUSTEP_SYSTEM_HEADERS, + GNUSTEP_LOCAL_HEADERS, GNUSTEP_USER_HEADERS, + GNUSTEP_NETWORK_HEADERS variables. + (GNUSTEP_HEADERS_FND_FLAG): For the fd foundation, use + GNUSTEP_TARGET_DIR instead of + GNUSTEP_TARGET_CPU/GNUSTEP_TARGET_OS. + Sun Jan 20 00:02:17 2002 Nicola Pero * common.make: Got rid of the GNUSTEP_HEADERS_TARGET_FLAGS diff --git a/common.make b/common.make index e27bdbd7..47b700c8 100644 --- a/common.make +++ b/common.make @@ -184,15 +184,13 @@ endif # # SYSTEM # -GNUSTEP_SYSTEM_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Headers - ifeq ($(GNUSTEP_FLATTENED),) GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_FLAGS = \ -L$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) GNUSTEP_SYSTEM_HEADERS_FLAGS = \ - -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_TARGET_DIR) \ - -I$(GNUSTEP_SYSTEM_HEADERS) + -I$(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \ + -I$(GNUSTEP_SYSTEM_ROOT)/Headers GNUSTEP_SYSTEM_LIBRARIES_FLAGS = \ -L$(GNUSTEP_SYSTEM_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \ -L$(GNUSTEP_SYSTEM_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR) @@ -201,7 +199,7 @@ else GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_FLAGS = \ -L$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries - GNUSTEP_SYSTEM_HEADERS_FLAGS = -I$(GNUSTEP_SYSTEM_HEADERS) + GNUSTEP_SYSTEM_HEADERS_FLAGS = -I$(GNUSTEP_SYSTEM_ROOT)/Headers GNUSTEP_SYSTEM_LIBRARIES_FLAGS = -L$(GNUSTEP_SYSTEM_ROOT)/Libraries endif @@ -214,15 +212,13 @@ GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS_FLAGS = \ # ifneq ($(GNUSTEP_LOCAL_ROOT),) - GNUSTEP_LOCAL_HEADERS = $(GNUSTEP_LOCAL_ROOT)/Headers - ifeq ($(GNUSTEP_FLATTENED),) GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_FLAGS = \ -L$(GNUSTEP_LOCAL_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) GNUSTEP_LOCAL_HEADERS_FLAGS = \ - -I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_TARGET_DIR) \ - -I$(GNUSTEP_LOCAL_HEADERS) + -I$(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \ + -I$(GNUSTEP_LOCAL_ROOT)/Headers GNUSTEP_LOCAL_LIBRARIES_FLAGS = \ -L$(GNUSTEP_LOCAL_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \ -L$(GNUSTEP_LOCAL_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR) @@ -230,7 +226,7 @@ ifneq ($(GNUSTEP_LOCAL_ROOT),) GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_FLAGS = \ -L$(GNUSTEP_LOCAL_ROOT)/Library/Libraries - GNUSTEP_LOCAL_HEADERS_FLAGS = -I$(GNUSTEP_LOCAL_HEADERS) + GNUSTEP_LOCAL_HEADERS_FLAGS = -I$(GNUSTEP_LOCAL_ROOT)/Headers GNUSTEP_LOCAL_LIBRARIES_FLAGS = -L$(GNUSTEP_LOCAL_ROOT)/Libraries endif @@ -244,15 +240,13 @@ endif # ifneq ($(GNUSTEP_USER_ROOT),) - GNUSTEP_USER_HEADERS = $(GNUSTEP_USER_ROOT)/Headers - ifeq ($(GNUSTEP_FLATTENED),) GNUSTEP_USER_FRAMEWORKS_LIBRARIES_FLAGS = \ -L$(GNUSTEP_USER_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) GNUSTEP_USER_HEADERS_FLAGS = \ - -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_TARGET_DIR) \ - -I$(GNUSTEP_USER_HEADERS) + -I$(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \ + -I$(GNUSTEP_USER_ROOT)/Headers GNUSTEP_USER_LIBRARIES_FLAGS = \ -L$(GNUSTEP_USER_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \ -L$(GNUSTEP_USER_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR) @@ -260,7 +254,7 @@ ifneq ($(GNUSTEP_USER_ROOT),) GNUSTEP_USER_FRAMEWORKS_LIBRARIES_FLAGS = \ -L$(GNUSTEP_USER_ROOT)/Library/Libraries - GNUSTEP_USER_HEADERS_FLAGS = -I$(GNUSTEP_USER_HEADERS) + GNUSTEP_USER_HEADERS_FLAGS = -I$(GNUSTEP_USER_ROOT)/Headers GNUSTEP_USER_LIBRARIES_FLAGS = -L$(GNUSTEP_USER_ROOT)/Libraries endif @@ -275,12 +269,10 @@ endif # ifneq ($(GNUSTEP_NETWORK_ROOT),) - GNUSTEP_NETWORK_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Headers - ifeq ($(GNUSTEP_FLATTENED),) GNUSTEP_NETWORK_HEADERS_FLAGS = \ - -I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_TARGET_DIR) \ - -I$(GNUSTEP_NETWORK_HEADERS) + -I$(GNUSTEP_NETWORK_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \ + -I$(GNUSTEP_NETWORK_ROOT)/Headers GNUSTEP_NETWORK_LIBRARIES_FLAGS = \ -L$(GNUSTEP_NETWORK_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \ -L$(GNUSTEP_NETWORK_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR) @@ -288,7 +280,7 @@ ifneq ($(GNUSTEP_NETWORK_ROOT),) GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_FLAGS = \ -L$(GNUSTEP_NETWORK_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) else - GNUSTEP_NETWORK_HEADERS_FLAGS = -I$(GNUSTEP_NETWORK_HEADERS) + GNUSTEP_NETWORK_HEADERS_FLAGS = -I$(GNUSTEP_NETWORK_ROOT)/Headers GNUSTEP_NETWORK_LIBRARIES_FLAGS = -L$(GNUSTEP_NETWORK_ROOT)/Libraries GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_FLAGS = \ @@ -335,20 +327,21 @@ ifeq ($(FOUNDATION_LIB),sun) endif ifneq ($(GNUSTEP_NETWORK_ROOT),) - GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_FND_DIR) + GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_NETWORK_ROOT)/Headers/$(GNUSTEP_FND_DIR) endif ifneq ($(GNUSTEP_USER_ROOT),) - GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR) + GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_FND_DIR) endif ifneq ($(GNUSTEP_LOCAL_ROOT),) - GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR) + GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_FND_DIR) endif -GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR) +GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_FND_DIR) ifeq ($(FOUNDATION_LIB), fd) - GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \ - -I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \ - -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) + GNUSTEP_HEADERS_FND_FLAG += \ + -I$(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) \ + -I$(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) \ + -I$(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) endif #