build changes

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

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 3e4b6f0f64f7fa61efdb15f45c20364aec3863f0..7852a46db61a33a0cd2cfb88f703ae1c755e4051 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-24  Maxime Wacker  <mwacker@linagora.com>
+
+       * GNUmakefile.preamble: fixes for the build process (v0.9.12)
+
 2004-08-16  Helge Hess  <helge.hess@skyrix.com>
        
        * SOGoCustomGroupFolder.m: added -initWithUIDs:inContainer: for using

diff --git a/SOGo/SoObjects/SOGo/GNUmakefile.preamble b/SOGo/SoObjects/SOGo/GNUmakefile.preamble
index c4c6bb23ff73936cba604770247bff21158e79e0..bf38c440fb0969cf281934654e319a3e53d527e5 100644 (file)
--- 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 3183fe844f0ef1d71acbc6aebddb7472056f10a6..094d8771fd82dfa343ea8e0858eddde0881c9c46 100644 (file)
--- 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 8dcf7642ff4fec1d5c3d5ba528462a0653403f77..70b643405a40da3545624b6bdaf577aa7cd57b6b 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-24  Maxime Wacker  <mwacker@linagora.com>
+
+       * GNUmakefile.preamble: fixes for the build process (v0.9.16)
+
 2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * 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 6d5a9d41d3641b00884ec4f799fda19f66e185fb..b56f92238335886256c3c6bd61d79f5bb48fd078 100644 (file)
--- 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 cf9e5c1262bbe256db9dcbe38538f8ad07693b99..27f42dca521c102631a68b11d5a0fab575d2dd28 100644 (file)
--- 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 9804e9372e521efbabadefdb8f8b7548bcfe0fde..0a8b5706ff367403f92145db662793dc2795d545 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-24  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble: changes for linking against SOPE 4.3 (v0.9.67)
+
 2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * 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 c240c8e8c3c73c4f3b39f6eec13d19b86a283dfc..20d7db051dfd01472ee243ec6d2dd16911a05d64 100644 (file)
--- 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 be53f48b6636bbb3942568f82efa0f6d922d9e45..c2617985eb8cc267388b59e181a5dc0a73bad128 100644 (file)
--- 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