From ae637ed8290ffd4fefde0e7b39f9d39c35b50779 Mon Sep 17 00:00:00 2001
From: Nicola Pero <n.pero@mi.flashnet.it>
Date: Mon, 1 Oct 2001 00:10:13 +0000
Subject: [PATCH] More purging of useless variables

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@11046 72102866-910b-0410-8b05-ffd578937521
---
 common.make | 40 ++++++++++++----------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/common.make b/common.make
index 46b241b8..846e1103 100644
--- a/common.make
+++ b/common.make
@@ -180,10 +180,8 @@ ifeq ($(GNUSTEP_FLATTENED),)
   GNUSTEP_SYSTEM_TARGET_LIBRARIES = \
 	$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
   GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
-  GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES = \
-	$(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-  GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES \
-	= $(GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
+  GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES = \
+        $(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR)
 
   GNUSTEP_SYSTEM_LIBRARIES_FLAGS = -L$(GNUSTEP_SYSTEM_LIBRARIES) \
                                    -L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES)
@@ -191,10 +189,8 @@ ifeq ($(GNUSTEP_FLATTENED),)
 else
   GNUSTEP_SYSTEM_TARGET_LIBRARIES = $(GNUSTEP_SYSTEM_LIBRARIES_ROOT)
   GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)
-  GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES = \
-	$(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)
   GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES = \
-	$(GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES)
+        $(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)
 
   GNUSTEP_SYSTEM_LIBRARIES_FLAGS = -L$(GNUSTEP_SYSTEM_LIBRARIES)
 endif
@@ -217,17 +213,13 @@ ifneq ($(GNUSTEP_LOCAL_ROOT),)
     GNUSTEP_LOCAL_TARGET_LIBRARIES = \
 	$(GNUSTEP_LOCAL_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
     GNUSTEP_LOCAL_LIBRARIES = $(GNUSTEP_LOCAL_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
-    GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES = \
-	$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-    GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES \
-	= $(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
+    GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES = \
+	$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR)
   else
     GNUSTEP_LOCAL_TARGET_LIBRARIES = $(GNUSTEP_LOCAL_LIBRARIES_ROOT)
     GNUSTEP_LOCAL_LIBRARIES = $(GNUSTEP_LOCAL_TARGET_LIBRARIES)
-    GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES = \
+    GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT)
-    GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES \
-	= $(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)
   endif
 
   GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAGS = -L$(GNUSTEP_LOCAL_TARGET_LIBRARIES)
@@ -253,17 +245,13 @@ ifneq ($(GNUSTEP_USER_ROOT),)
 	$(GNUSTEP_USER_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
     GNUSTEP_USER_LIBRARIES \
 	= $(GNUSTEP_USER_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
-    GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES = \
-	$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-    GNUSTEP_USER_FRAMEWORKS_LIBRARIES \
-	= $(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
+    GNUSTEP_USER_FRAMEWORKS_LIBRARIES = \
+	$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR)
   else
     GNUSTEP_USER_TARGET_LIBRARIES = $(GNUSTEP_USER_LIBRARIES_ROOT)
     GNUSTEP_USER_LIBRARIES = $(GNUSTEP_USER_TARGET_LIBRARIES)
-    GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES = \
+    GNUSTEP_USER_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT)
-    GNUSTEP_USER_FRAMEWORKS_LIBRARIES \
-	= $(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)
   endif
 
   GNUSTEP_USER_TARGET_LIBRARIES_FLAGS = -L$(GNUSTEP_USER_TARGET_LIBRARIES)
@@ -288,17 +276,13 @@ ifneq ($(GNUSTEP_NETWORK_ROOT),)
 	$(GNUSTEP_NETWORK_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
     GNUSTEP_NETWORK_LIBRARIES \
 	= $(GNUSTEP_NETWORK_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
-    GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES = \
-	$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-    GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES \
-	= $(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
+    GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES = \
+	$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR)
   else
     GNUSTEP_NETWORK_TARGET_LIBRARIES = $(GNUSTEP_NETWORK_LIBRARIES_ROOT)
     GNUSTEP_NETWORK_LIBRARIES = $(GNUSTEP_NETWORK_TARGET_LIBRARIES)
-    GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES = \
+    GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT)
-    GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES \
-	= $(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)
   endif
 
   GNUSTEP_NETWORK_LIBRARIES_FLAGS = -L$(GNUSTEP_NETWORK_LIBRARIES)