compile fixes

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

diff --git a/SOGo/Protocols/common.make b/SOGo/Protocols/common.make
index 35b48ee619e1de283be3f062da10f581ba36a837..ab0672039b5447edb5bf031c4eb112936500743a 100644 (file)
--- a/SOGo/Protocols/common.make
+++ b/SOGo/Protocols/common.make
@@ -15,20 +15,17 @@ ADDITIONAL_INCLUDE_DIRS += \
 
 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_libSOGo)               \
-       -L$(RELBUILD_DIR_libSOGoLogic)          \
        -L$(RELBUILD_DIR_libOGoContentStore)
 
 ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
 
 BUNDLE_LIBS +=                                 \
-       -lSOGo -lSOGoLogic                      \
+       -lSOGo                                  \
        -lOGoContentStore                       \
        -lGDLAccess                             \
        -lNGObjWeb                              \

diff --git a/SOGo/SoObjects/ChangeLog b/SOGo/SoObjects/ChangeLog
index 134463365c5b956652e0eebbef50d35f415d9c17..c761d83f1921f21872e369cc6820d7bbaa82f49b 100644 (file)
--- a/SOGo/SoObjects/ChangeLog
+++ b/SOGo/SoObjects/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-17  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * common.make: removed dependency to removed libSOGoLogic
+
 2005-02-15  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.25

diff --git a/SOGo/SoObjects/common.make b/SOGo/SoObjects/common.make
index 7187754fecf7a3b171ebdc4b8c72368e4e171a86..b2de7aa79040d533ad97d679bb7826f3d99fdeb7 100644 (file)
--- a/SOGo/SoObjects/common.make
+++ b/SOGo/SoObjects/common.make
@@ -18,10 +18,10 @@ ADDITIONAL_LIB_DIRS += \
         -L/usr/local/lib -L/usr/lib
 
 BUNDLE_LIBS += \
-       -lSOGo -lSOGoLogic      \
-       -lOGoContentStore       \
-       -lGDLAccess             \
-       -lNGObjWeb              \
-       -lNGiCal -lNGMime -lNGLdap \
-       -lNGStreams -lNGExtensions -lEOControl \
+       -lSOGo                                  \
+       -lOGoContentStore                       \
+       -lGDLAccess                             \
+       -lNGObjWeb                              \
+       -lNGiCal -lNGMime -lNGLdap              \
+       -lNGStreams -lNGExtensions -lEOControl  \
        -lXmlRpc -lDOM -lSaxObjC

diff --git a/SOGo/UI/ChangeLog b/SOGo/UI/ChangeLog
index 8802f2fccb3408f99ad062a3ed9ed017967fab56..f2c6a0fae90af3ccce5eefe8dfd019766cf65caf 100644 (file)
--- a/SOGo/UI/ChangeLog
+++ b/SOGo/UI/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-17  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * common.make: removed dependency to removed libSOGoLogic
+
 2004-10-15  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * common.make: updates for inline compilation, removed compatibility

diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make
index 04f510a903c97c15fddd1e151c585c80e971bdb8..932385614ae1652959783ad109895c921357be3a 100644 (file)
--- a/SOGo/UI/common.make
+++ b/SOGo/UI/common.make
@@ -17,25 +17,22 @@ 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_libSOGo)               \
        -L$(RELBUILD_DIR_libSOGoUI)             \
-       -L$(RELBUILD_DIR_libSOGoLogic)          \
        -L$(RELBUILD_DIR_libOGoContentStore)
 
 ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
 
 BUNDLE_LIBS += \
-       -lSOGoUI                \
-       -lSOGo -lSOGoLogic      \
-       -lOGoContentStore       \
-       -lGDLAccess             \
-       -lNGObjWeb              \
-       -lNGMime -lNGiCal -lNGLdap \
+       -lSOGoUI                                \
+       -lSOGo                                  \
+       -lOGoContentStore                       \
+       -lGDLAccess                             \
+       -lNGObjWeb                              \
+       -lNGMime -lNGiCal -lNGLdap              \
        -lNGStreams -lNGExtensions -lEOControl  \
        -lXmlRpc -lDOM -lSaxObjC