From e73d34330e67a7e9e6659ba22211033363c70233 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 20 Aug 2004 19:49:55 +0000
Subject: [PATCH] fixed sope-ical for SOPE 3.3 layout

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@12 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 INSTALL                                      | 29 ++++++++++++++++++++
 sope-ical/NGiCal/ChangeLog                   |  2 ++
 sope-ical/NGiCal/GNUmakefile                 |  2 +-
 sope-ical/NGiCal/GNUmakefile.preamble        | 19 ++++++++-----
 sope-ical/NGiCal/Version                     |  4 ++-
 sope-ical/iCalSaxDriver/ChangeLog            |  2 ++
 sope-ical/iCalSaxDriver/GNUmakefile          |  2 +-
 sope-ical/iCalSaxDriver/GNUmakefile.preamble |  9 ++++--
 sope-ical/iCalSaxDriver/Version              |  2 +-
 9 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/INSTALL b/INSTALL
index efe7fc5a..9d97ce7c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,5 +15,34 @@ sope-core
 sope-ldap
 - openldap2/openldap2-dev
 
+sope-ical
+- libical (eg ThirdParty/libical)
+
 sope-gdl1
 - postgresql-dev
+
+Dependencies
+============
+
+- sope-xml
+- [self contained]
+
+sope-core
+- sope-xml
+
+sope-mime
+- sope-core
+
+sope-ical
+- sope-xml
+- sope-core
+
+sope-ldap
+
+sope-appserver
+- sope-xml
+- sope-core
+- sope-mime (to be removed!)
+
+sope-gdl1
+- sope-core
diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog
index 2ab2fee7..5d07114a 100644
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
+	* fixed for SOPE 3.3 directory layout (v4.3.26)
+
 	* moved to sope-ical
 
 	* moved to SOPE 4.3 (v4.3.25)
diff --git a/sope-ical/NGiCal/GNUmakefile b/sope-ical/NGiCal/GNUmakefile
index 3b536f0a..8343de5f 100644
--- a/sope-ical/NGiCal/GNUmakefile
+++ b/sope-ical/NGiCal/GNUmakefile
@@ -1,6 +1,6 @@
 # $Id$
 
-include ../common.make
+include $(GNUSTEP_MAKEFILES)/common.make
 
 LIBRARY_NAME = libNGiCal
 
diff --git a/sope-ical/NGiCal/GNUmakefile.preamble b/sope-ical/NGiCal/GNUmakefile.preamble
index b255f0f4..88c4e46f 100644
--- a/sope-ical/NGiCal/GNUmakefile.preamble
+++ b/sope-ical/NGiCal/GNUmakefile.preamble
@@ -1,11 +1,19 @@
 # $Id$
 
+
+ADDITIONAL_INCLUDE_DIRS += \
+	-I. -I..			\
+	-I../../sope-core/NGExtensions/	\
+	-I../../sope-core		\
+	-I../../sope-xml
+
+
 libNGiCal_LIBRARIES_DEPEND_UPON = \
 	-lSaxObjC -lEOControl
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../skyrix-xml
+RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core
+RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
 libNGiCal_LIB_DIRS += \
 	-L$(GNUSTEP_OBJ_DIR)						\
@@ -14,13 +22,10 @@ libNGiCal_LIB_DIRS += \
 else
 libNGiCal_LIB_DIRS += \
 	-L./$(GNUSTEP_OBJ_DIR)				\
-	-L../../skyrix-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)	\
-	-L../EOControl/$(GNUSTEP_OBJ_DIR)
+	-L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)	\
+	-L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
-ADDITIONAL_INCLUDE_DIRS += \
-	-I. -I..	\
-	-I../NGExtensions/
 
 
 # Apple
diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version
index 8b283eb3..792a40a9 100644
--- a/sope-ical/NGiCal/Version
+++ b/sope-ical/NGiCal/Version
@@ -1,3 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=25
+MAJOR_VERSION=4
+MINOR_VERSION=3
+SUBMINOR_VERSION:=26
diff --git a/sope-ical/iCalSaxDriver/ChangeLog b/sope-ical/iCalSaxDriver/ChangeLog
index e476b6ec..f33c5753 100644
--- a/sope-ical/iCalSaxDriver/ChangeLog
+++ b/sope-ical/iCalSaxDriver/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
+	* fixed for SOPE 3.3 directory layout (v4.3.10)
+
 	* moved from sope-xml to sope-ical (v4.3.9)
 
 2004-07-02  Helge Hess  <helge.hess@opengroupware.org>
diff --git a/sope-ical/iCalSaxDriver/GNUmakefile b/sope-ical/iCalSaxDriver/GNUmakefile
index 09454d72..048f8936 100644
--- a/sope-ical/iCalSaxDriver/GNUmakefile
+++ b/sope-ical/iCalSaxDriver/GNUmakefile
@@ -1,6 +1,6 @@
 # $Id$
 
-include ../common.make
+include $(GNUSTEP_MAKEFILES)/common.make
 
 BUNDLE_NAME        = iCalSaxDriver
 BUNDLE_EXTENSION   = .sax
diff --git a/sope-ical/iCalSaxDriver/GNUmakefile.preamble b/sope-ical/iCalSaxDriver/GNUmakefile.preamble
index 02ba40be..d495c33f 100644
--- a/sope-ical/iCalSaxDriver/GNUmakefile.preamble
+++ b/sope-ical/iCalSaxDriver/GNUmakefile.preamble
@@ -1,12 +1,17 @@
 # $Id$
 
+
+ADDITIONAL_INCLUDE_DIRS += \
+	-I../../sope-xml
+
+
 BUNDLE_LIBS += -lSaxObjC -lical
 
 ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS)
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
 ADDITIONAL_LIB_DIRS += \
-	-L$(GNUSTEP_BUILD_DIR)/../SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
+	-L$(GNUSTEP_BUILD_DIR)/../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
 else
-ADDITIONAL_LIB_DIRS += -L../SaxObjC/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
diff --git a/sope-ical/iCalSaxDriver/Version b/sope-ical/iCalSaxDriver/Version
index 81be7eb6..317960a7 100644
--- a/sope-ical/iCalSaxDriver/Version
+++ b/sope-ical/iCalSaxDriver/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=10
-- 
2.39.5