updates to inline compilation

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@402 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/Protocols/common.make b/SOGo/Protocols/common.make
index 2355a197f40288a4d22fdbaaa1e6a54153b4bc2c..cd675a2c46bf03aa7cdb149658a9e0bba87ce45e 100644 (file)
--- 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