From 03de1cf9d77f65a481ffbdac64140ba247db31cb Mon Sep 17 00:00:00 2001 From: znek Date: Wed, 1 Sep 2004 13:29:39 +0000 Subject: [PATCH] Build fixes for gsmake 1.9.2 git-svn-id: http://svn.opengroupware.org/SOGo/trunk@292 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/SOGo/ChangeLog | 8 ++++++++ SOGo/SoObjects/SOGo/GNUmakefile | 1 + SOGo/SoObjects/SOGo/GNUmakefile.preamble | 4 ++-- SOGo/SoObjects/SOGo/Version | 2 +- SOGo/UI/Contacts/ChangeLog | 6 +++++- SOGo/UI/Contacts/GNUmakefile.preamble | 2 +- SOGo/UI/Contacts/Version | 2 +- SOGo/UI/Mailer/ChangeLog | 4 ++++ SOGo/UI/Mailer/GNUmakefile.preamble | 2 +- SOGo/UI/Mailer/Version | 2 +- SOGo/UI/Scheduler/ChangeLog | 4 ++++ SOGo/UI/Scheduler/GNUmakefile.preamble | 2 +- SOGo/UI/Scheduler/Version | 2 +- 13 files changed, 31 insertions(+), 10 deletions(-) diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 0522beaa..3f389e2f 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -1,3 +1,11 @@ +2004-09-01 Marcus Mueller + + * v0.9.14 + + * GNUmakefile.preamble: fixed for gsmake 1.9.2 build + + * GNUmakefile: include ../../Version also + 2004-08-26 Helge Hess * SOGoUserFolder.m: added ability to create Contacts folder (v0.9.13) diff --git a/SOGo/SoObjects/SOGo/GNUmakefile b/SOGo/SoObjects/SOGo/GNUmakefile index a0a3e95d..a1db9856 100644 --- a/SOGo/SoObjects/SOGo/GNUmakefile +++ b/SOGo/SoObjects/SOGo/GNUmakefile @@ -1,6 +1,7 @@ # $Id$ include $(GNUSTEP_MAKEFILES)/common.make +-include ../../Version -include ./Version LIBRARY_NAME = libSOGo diff --git a/SOGo/SoObjects/SOGo/GNUmakefile.preamble b/SOGo/SoObjects/SOGo/GNUmakefile.preamble index bf38c440..64fb213a 100644 --- a/SOGo/SoObjects/SOGo/GNUmakefile.preamble +++ b/SOGo/SoObjects/SOGo/GNUmakefile.preamble @@ -1,10 +1,10 @@ # $Id$ -libSOGo_INCLUDE_DIRS += -I.. +libSOGo_INCLUDE_DIRS += -I.. -I../../.. ifneq ($(GNUSTEP_BUILD_DIR),) RELBUILD_DIR_libOGoContentStore = \ - $(GNUSTEP_BUILD_DIR)/../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME) + $(GNUSTEP_BUILD_DIR)/../../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME) else RELBUILD_DIR_libOGoContentStore = \ ../../../OGoContentStore/$(GNUSTEP_OBJ_DIR) diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version index 0dca6b81..72b1d704 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:=13 +SUBMINOR_VERSION:=14 diff --git a/SOGo/UI/Contacts/ChangeLog b/SOGo/UI/Contacts/ChangeLog index 6875d4ca..cd62e6d6 100644 --- a/SOGo/UI/Contacts/ChangeLog +++ b/SOGo/UI/Contacts/ChangeLog @@ -1,3 +1,7 @@ +2004-09-01 Marcus Mueller + + * GNUmakefile.preamble: fixed for gsmake 1.9.2 build (v0.9.8) + 2004-08-27 Marcus Mueller * v0.9.7 @@ -30,4 +34,4 @@ * UIxContact*: added template views - * ChangeLog: created \ No newline at end of file + * ChangeLog: created diff --git a/SOGo/UI/Contacts/GNUmakefile.preamble b/SOGo/UI/Contacts/GNUmakefile.preamble index 03d90b09..b869cc78 100644 --- a/SOGo/UI/Contacts/GNUmakefile.preamble +++ b/SOGo/UI/Contacts/GNUmakefile.preamble @@ -11,7 +11,7 @@ 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) + $(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME) else RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR) RELBUILD_DIR_libSOGoLogic = ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR) diff --git a/SOGo/UI/Contacts/Version b/SOGo/UI/Contacts/Version index cab297dc..28292b54 100644 --- a/SOGo/UI/Contacts/Version +++ b/SOGo/UI/Contacts/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=7 +SUBMINOR_VERSION:=8 diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog index 88155401..fbd74c10 100644 --- a/SOGo/UI/Mailer/ChangeLog +++ b/SOGo/UI/Mailer/ChangeLog @@ -1,3 +1,7 @@ +2004-09-01 Marcus Mueller + + * GNUmakefile.preamble: fixed for gsmake 1.9.2 build (v0.9.1) + 2004-08-26 Marcus Mueller * ChangeLog: created diff --git a/SOGo/UI/Mailer/GNUmakefile.preamble b/SOGo/UI/Mailer/GNUmakefile.preamble index 8e2242e2..e282c47f 100644 --- a/SOGo/UI/Mailer/GNUmakefile.preamble +++ b/SOGo/UI/Mailer/GNUmakefile.preamble @@ -11,7 +11,7 @@ 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) + $(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME) else RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR) RELBUILD_DIR_libSOGoLogic = ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR) diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version index 9385a64d..237a5904 100644 --- a/SOGo/UI/Mailer/Version +++ b/SOGo/UI/Mailer/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=0 +SUBMINOR_VERSION:=1 diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index c3ced98f..d613cddf 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,7 @@ +2004-09-01 Marcus Mueller + + * GNUmakefile.preamble: fixed for gsmake 1.9.2 build (v0.9.76) + 2004-08-31 Marcus Mueller * UIxCalView.m: fixed stupid bug (v0.9.75) diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble index 1fc3dad3..4400b925 100644 --- a/SOGo/UI/Scheduler/GNUmakefile.preamble +++ b/SOGo/UI/Scheduler/GNUmakefile.preamble @@ -11,7 +11,7 @@ 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) + $(GNUSTEP_BUILD_DIR)/../../../SOGoLogic/$(GNUSTEP_OBJ_DIR_NAME) else RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR) RELBUILD_DIR_libSOGoLogic = ../../../SOGoLogic/$(GNUSTEP_OBJ_DIR) diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index e70afeff..2828c54e 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,6 +1,6 @@ # $Id$ -SUBMINOR_VERSION:=75 +SUBMINOR_VERSION:=76 # v0.9.70 requires libNGExtensions v4.3.107 # v0.9.67 requires SOPE 4.3 -- 2.39.5