From 17cce385c94badf5866d5bf811e352d7e364532c Mon Sep 17 00:00:00 2001 From: znek Date: Tue, 24 Aug 2004 12:59:34 +0000 Subject: [PATCH] build changes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@263 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/SOGo/ChangeLog | 4 ++++ SOGo/SoObjects/SOGo/GNUmakefile.preamble | 13 ++++++++++++- SOGo/SoObjects/SOGo/Version | 2 +- SOGo/UI/Common/ChangeLog | 4 ++++ SOGo/UI/Common/GNUmakefile.preamble | 2 ++ SOGo/UI/Common/Version | 2 +- SOGo/UI/Scheduler/ChangeLog | 4 ++++ SOGo/UI/Scheduler/GNUmakefile.preamble | 19 ++++++++++++------- SOGo/UI/Scheduler/Version | 3 ++- 9 files changed, 42 insertions(+), 11 deletions(-) diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 3e4b6f0f..7852a46d 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -1,3 +1,7 @@ +2004-08-24 Maxime Wacker + + * GNUmakefile.preamble: fixes for the build process (v0.9.12) + 2004-08-16 Helge Hess * SOGoCustomGroupFolder.m: added -initWithUIDs:inContainer: for using diff --git a/SOGo/SoObjects/SOGo/GNUmakefile.preamble b/SOGo/SoObjects/SOGo/GNUmakefile.preamble index c4c6bb23..bf38c440 100644 --- a/SOGo/SoObjects/SOGo/GNUmakefile.preamble +++ b/SOGo/SoObjects/SOGo/GNUmakefile.preamble @@ -1,6 +1,17 @@ # $Id$ -ADDITIONAL_INCLUDE_DIRS += -I.. +libSOGo_INCLUDE_DIRS += -I.. + +ifneq ($(GNUSTEP_BUILD_DIR),) + RELBUILD_DIR_libOGoContentStore = \ + $(GNUSTEP_BUILD_DIR)/../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME) +else + RELBUILD_DIR_libOGoContentStore = \ + ../../../OGoContentStore/$(GNUSTEP_OBJ_DIR) +endif + +libSOGo_LIB_DIRS += \ + -L$(RELBUILD_DIR_libOGoContentStore) \ libSOGo_LIBRARIES_DEPEND_UPON += \ -lOGoContentStore \ diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version index 3183fe84..094d8771 100644 --- a/SOGo/SoObjects/SOGo/Version +++ b/SOGo/SoObjects/SOGo/Version @@ -1,3 +1,3 @@ # $Id: Version 170 2004-08-11 10:45:40Z helge $ -SUBMINOR_VERSION:=11 +SUBMINOR_VERSION:=12 diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog index 8dcf7642..70b64340 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -1,3 +1,7 @@ +2004-08-24 Maxime Wacker + + * GNUmakefile.preamble: fixes for the build process (v0.9.16) + 2004-08-16 Marcus Mueller * calendar.css: additional css for Anais uids (v0.9.15) diff --git a/SOGo/UI/Common/GNUmakefile.preamble b/SOGo/UI/Common/GNUmakefile.preamble index 6d5a9d41..b56f9223 100644 --- a/SOGo/UI/Common/GNUmakefile.preamble +++ b/SOGo/UI/Common/GNUmakefile.preamble @@ -1,5 +1,7 @@ # $Id$ +CommonUI_INCLUDE_DIRS += -I.. + ifneq ($(GNUSTEP_BUILD_DIR),) RELBUILD_DIR_libSOGoUI = \ $(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME) diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version index cf9e5c12..27f42dca 100644 --- a/SOGo/UI/Common/Version +++ b/SOGo/UI/Common/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=15 +SUBMINOR_VERSION:=16 diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 9804e937..0a8b5706 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,7 @@ +2004-08-24 Marcus Mueller + + * GNUmakefile.preamble: changes for linking against SOPE 4.3 (v0.9.67) + 2004-08-16 Marcus Mueller * AnaisUidSelector.[wox,m]: Added colorizing of login's uid. (v0.9.66) diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble index c240c8e8..20d7db05 100644 --- a/SOGo/UI/Scheduler/GNUmakefile.preamble +++ b/SOGo/UI/Scheduler/GNUmakefile.preamble @@ -6,18 +6,23 @@ 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_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR) + RELBUILD_DIR_libSOGoLogic = ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR) endif -SchedulerUI_LIB_DIRS += -L$(RELBUILD_DIR_libSOGoUI) +SchedulerUI_LIB_DIRS += \ + -L$(RELBUILD_DIR_libSOGoUI) \ + -L$(RELBUILD_DIR_libSOGoLogic) -SchedulerUI_BUNDLE_LIBS += \ - -lNGObjWeb -lNGScripting -lNGJavaScript -ljs \ +SchedulerUI_BUNDLE_LIBS += \ + -lNGObjWeb -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC \ - -lSOGoLogic -lSOGoUI \ - -lNGiCal + -lXmlRpc -lDOM -lSaxObjC -lNGiCal \ + -lSOGoLogic -lSOGoUI \ diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index be53f48b..c2617985 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,7 +1,8 @@ # $Id$ -SUBMINOR_VERSION:=66 +SUBMINOR_VERSION:=67 +# v0.9.67 requires SOPE 4.3 # v0.9.61 requires libNGExtensions v4.2.102 # v0.9.41 requires libNGObjWeb v4.2.431 # v0.9.31 requires libWEExtensions v4.2.52 -- 2.39.2