compile fixes

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

diff --git a/SOGo/UI/ChangeLog b/SOGo/UI/ChangeLog
index 3733b8046ded9973b25bbc48db0b0087c36053e9..8802f2fccb3408f99ad062a3ed9ed017967fab56 100644 (file)
--- a/SOGo/UI/ChangeLog
+++ b/SOGo/UI/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-15  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * common.make: updates for inline compilation, removed compatibility
+         for gstep-make < 1.10
+
 2004-09-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * README: Update with information regarding localization

diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make
index a5d5b10b7eed8f3c013604a6ff2f6fb0c85154f1..1912e2f7190664df5aa11afb8233afcec7e80dc4 100644 (file)
--- a/SOGo/UI/common.make
+++ b/SOGo/UI/common.make
@@ -11,19 +11,20 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I../../..      \
        -I../../SoObjects
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-       RELBUILD_DIR_libSOGoUI = \
-               $(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME)
-       RELBUILD_DIR_libSOGoLogic = \
-               $(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME)
-else
-       RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR)
-       RELBUILD_DIR_libSOGoLogic = ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR)
-endif
+RELBUILD_DIR_libSOGo = \
+       $(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
+RELBUILD_DIR_libSOGoUI = \
+       $(GNUSTEP_BUILD_DIR)/../SOGoUI/$(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_libSOGoUI)     \
-       -L$(RELBUILD_DIR_libSOGoLogic)
+ADDITIONAL_LIB_DIRS +=                                 \
+       -L$(RELBUILD_DIR_libSOGo)               \
+       -L$(RELBUILD_DIR_libSOGoUI)             \
+       -L$(RELBUILD_DIR_libSOGoLogic)          \
+       -L$(RELBUILD_DIR_libOGoContentStore)
 
 ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib