From f3c237acb7dd34131344ff90e7dd662841e5263a Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 15 Oct 2004 16:11:39 +0000
Subject: [PATCH] updates to inline compilation

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@402 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/Protocols/common.make | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/SOGo/Protocols/common.make b/SOGo/Protocols/common.make
index 2355a197..cd675a2c 100644
--- a/SOGo/Protocols/common.make
+++ b/SOGo/Protocols/common.make
@@ -1,4 +1,4 @@
-# common make file for UI bundles
+# common make file for Protocol bundles
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -11,23 +11,25 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I../../..	\
 	-I../../SoObjects
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-	RELBUILD_DIR_libSOGoLogic = \
-		$(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME)
-else
-	RELBUILD_DIR_libSOGoLogic = ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)
-endif
+RELBUILD_DIR_libSOGo = \
+	$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
+RELBUILD_DIR_libSOGoLogic = \
+	$(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME)
+RELBUILD_DIR_libOGoContentStore = \
+	$(GNUSTEP_BUILD_DIR)/../../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
 
-ADDITIONAL_LIB_DIRS += \
-	-L$(RELBUILD_DIR_libSOGoLogic)
+ADDITIONAL_LIB_DIRS += 				\
+	-L$(RELBUILD_DIR_libSOGo)		\
+	-L$(RELBUILD_DIR_libSOGoLogic)		\
+	-L$(RELBUILD_DIR_libOGoContentStore)
 
 ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
 
-BUNDLE_LIBS += \
-	-lSOGo -lSOGoLogic	\
-	-lOGoContentStore	\
-	-lGDLAccess		\
-	-lNGObjWeb		\
-	-lNGMime -lNGiCal -lNGLdap \
+BUNDLE_LIBS +=					\
+	-lSOGo -lSOGoLogic			\
+	-lOGoContentStore			\
+	-lGDLAccess				\
+	-lNGObjWeb				\
+	-lNGMime -lNGiCal -lNGLdap 		\
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC
-- 
2.39.5