fixed sope-ical for SOPE 3.3 layout

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@12 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/INSTALL b/INSTALL
index efe7fc5a3397c9865d5225b5d4a38ec9e66a4caa..9d97ce7cd0b62a2c7e3f78f523eab5ca36b0c839 100644 (file)
--- 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 2ab2fee77528d8db0813bdde222a5248997275b8..5d07114a0b248e69100be728c28503a06880cd4e 100644 (file)
--- 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 3b536f0ade3154e187d7c0e3b0f738facf0c192b..8343de5f0c49394de68e03619c6a924773b7456b 100644 (file)
--- 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 b255f0f40f9e309fa644ae2c4171d14fa31557f9..88c4e46f39f4d152c2dbbaf40521772be721c4f2 100644 (file)
--- 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 8b283eb3b53cdd6a8e556ffea74b87430ca7e635..792a40a93c01d77dc66407d93b9cd64910894260 100644 (file)
--- 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 e476b6ec89dfa9fc004f426df7843ba59d058254..f33c575341c52b41d7e06f02abfc859ef3142801 100644 (file)
--- 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 09454d72131aa966c3a040235fc833ee4190bf2f..048f8936051e5feabe90d3054f9053f055551322 100644 (file)
--- 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 02ba40be6c88490ae5528a2ae23556486f93ff13..d495c33f330c5f460ea2572f5178822957d66708 100644 (file)
--- 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 81be7eb6e79defb0b93e0ca78f8a44c310c033c2..317960a726fc24e656b0d801367866c318018c26 100644 (file)
--- a/sope-ical/iCalSaxDriver/Version
+++ b/sope-ical/iCalSaxDriver/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=10