From 395544e22d14d3d9da10941ff49cfdf0c0806d56 Mon Sep 17 00:00:00 2001 From: znek Date: Thu, 17 Feb 2005 16:21:10 +0000 Subject: [PATCH] compile fixes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@580 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/Protocols/common.make | 5 +---- SOGo/SoObjects/ChangeLog | 4 ++++ SOGo/SoObjects/common.make | 12 ++++++------ SOGo/UI/ChangeLog | 4 ++++ SOGo/UI/common.make | 15 ++++++--------- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/SOGo/Protocols/common.make b/SOGo/Protocols/common.make index 35b48ee6..ab067203 100644 --- 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 13446336..c761d83f 100644 --- a/SOGo/SoObjects/ChangeLog +++ b/SOGo/SoObjects/ChangeLog @@ -1,3 +1,7 @@ +2005-02-17 Marcus Mueller + + * common.make: removed dependency to removed libSOGoLogic + 2005-02-15 Marcus Mueller * v0.9.25 diff --git a/SOGo/SoObjects/common.make b/SOGo/SoObjects/common.make index 7187754f..b2de7aa7 100644 --- 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 8802f2fc..f2c6a0fa 100644 --- a/SOGo/UI/ChangeLog +++ b/SOGo/UI/ChangeLog @@ -1,3 +1,7 @@ +2005-02-17 Marcus Mueller + + * common.make: removed dependency to removed libSOGoLogic + 2004-10-15 Marcus Mueller * common.make: updates for inline compilation, removed compatibility diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make index 04f510a9..93238561 100644 --- 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 -- 2.39.5