Build fixes for gsmake 1.9.2

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

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index 0522beaa38ae56b348143cfb033c40e0b375f24f..3f389e2f355fa823a86d5976c55f81ccdb0d5a7c 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-01  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.14
+
+        * GNUmakefile.preamble: fixed for gsmake 1.9.2 build
+
+       * GNUmakefile: include ../../Version also
+
 2004-08-26  Helge Hess  <helge.hess@skyrix.com>
 
        * SOGoUserFolder.m: added ability to create Contacts folder (v0.9.13)

diff --git a/SOGo/SoObjects/SOGo/GNUmakefile b/SOGo/SoObjects/SOGo/GNUmakefile
index a0a3e95d8f6a319e09012b38eeb0c29607c220ae..a1db9856da1a2a879f46bf6c4060d021d06bd22f 100644 (file)
--- 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 bf38c440fb0969cf281934654e319a3e53d527e5..64fb213ac74657fe248a25c039251dd331fac85e 100644 (file)
--- 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 0dca6b813d5a93752d6856c23b7a8f532c810efd..72b1d704312af20765a542b3c7585bef2f59d22f 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:=13
+SUBMINOR_VERSION:=14

diff --git a/SOGo/UI/Contacts/ChangeLog b/SOGo/UI/Contacts/ChangeLog
index 6875d4cad3756c6a705e40e4394ed54926af1e0a..cd62e6d6a3f57d08d036eea11e4aa1f5999337f5 100644 (file)
--- a/SOGo/UI/Contacts/ChangeLog
+++ b/SOGo/UI/Contacts/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-01  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble: fixed for gsmake 1.9.2 build (v0.9.8)
+       
 2004-08-27  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * 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 03d90b09050409434230156ccd3158f8ec10aee7..b869cc788add3c24f3dd171adaf94c0eddb53fdd 100644 (file)
--- 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 cab297dce179f93daddb8c8e20c17af86c0b5d3b..28292b549059af8a6800e33ac74ed5ab727067ed 100644 (file)
--- 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 88155401786dfb46e9bd1561f8d0e0bf55b8706e..fbd74c10932acb10ac46481af20040e71849c37b 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-01  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+        * GNUmakefile.preamble: fixed for gsmake 1.9.2 build (v0.9.1)
+
 2004-08-26  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * ChangeLog: created

diff --git a/SOGo/UI/Mailer/GNUmakefile.preamble b/SOGo/UI/Mailer/GNUmakefile.preamble
index 8e2242e284bcf4ddae2f5b91b80327913a8d9e0e..e282c47fc4490ba0e8d092e50e10e7ea284aee5e 100644 (file)
--- 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 9385a64dc7a2742a1c9d7548d97774a250f7307f..237a59049190fb100f4d3a877ebcfed082bc30dc 100644 (file)
--- 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 c3ced98f9a27268ac09d1eafe7f4a481b5d0af18..d613cddf90524635fface382ac364ff5fa99c67a 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-01  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * GNUmakefile.preamble: fixed for gsmake 1.9.2 build (v0.9.76)
+
 2004-08-31  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxCalView.m: fixed stupid bug (v0.9.75)

diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble
index 1fc3dad3c0a6f535d1eb423d51d17f5937cb919a..4400b925ff9eba2c73d213a90e395cd24a17921f 100644 (file)
--- 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 e70afefffe3d458f465708298b1603ed14c4e283..2828c54e03d577cbcaae78825dcf73d8c337a3a0 100644 (file)
--- 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