From edb8c3dd0c5e40faa5540d8f0c1934d068cf1615 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 9 Feb 2007 16:32:08 +0000
Subject: [PATCH] Monotone-Parent: f2019cdd67c2c2aaf3f43178f49a72b8831dae77
 Monotone-Revision: 3242f9d1972a6e4989f7bfbfb16fa7d5dc477e26

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-02-09T16:32:08
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/SOGo/GNUmakefile.preamble | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index 0a7155d9b..f49ab0b73 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -2,18 +2,7 @@
 
 libSOGo_INCLUDE_DIRS += -I.. -I../../..
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-	RELBUILD_DIR_libOGoContentStore = \
-		$(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
-else
-	RELBUILD_DIR_libOGoContentStore = \
-		../../OGoContentStore/$(GNUSTEP_OBJ_DIR)
-endif
-
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-
-libSOGo_LIB_DIRS +=				\
-	-L$(RELBUILD_DIR_libOGoContentStore) -L$(RELBUILD_DIR_libOGoContentStore)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)
+SYSTEM_LIB_DIR += -L/usr/local/lib
 
 libSOGo_LIBRARIES_DEPEND_UPON += \
 	-lOGoContentStore	\
@@ -27,9 +16,9 @@ libSOGo_LIBRARIES_DEPEND_UPON += \
 
 ADDITIONAL_TOOL_LIBS += \
         -L$(GNUSTEP_OBJ_DIR)/ \
-        $(libSOGO_LIB_DIRS) \
+        -lSOGo \
 	-lGDLContentStore -lGDLAccess	\
+        -lNGCards                       \
 	-lNGLdap			\
 	-lNGExtensions -lEOControl	\
 	-lDOM -lSaxObjC
-