added OSX framework support

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

diff --git a/sope-core/ChangeLog b/sope-core/ChangeLog
index 4c0186fcff65df578b65ca383c8c0b666720c157..04605d2a4066f1acbc3d64bc194ddb65460bac23 100644 (file)
--- a/sope-core/ChangeLog
+++ b/sope-core/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-10  Helge Hess  <helge.hess@opengroupware.org>
+
+       * all makefiles: added flags to build only frameworks on MacOSX
+
 2005-08-08  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * README-OSX.txt: updated prebinding info

diff --git a/sope-core/EOControl/GNUmakefile b/sope-core/EOControl/GNUmakefile
index aa6c8b5e27c27f0d4d3ffba4b2f96c55f5cf9049..4257acca463886fbc862d40569ac0d24115b9b65 100644 (file)
--- a/sope-core/EOControl/GNUmakefile
+++ b/sope-core/EOControl/GNUmakefile
@@ -3,7 +3,11 @@
 -include ../../config.make
 include ../common.make
 
+ifneq ($(frameworks),yes)
 LIBRARY_NAME = libEOControl
+else
+FRAMEWORK_NAME = EOControl
+endif
 
 libEOControl_DLL_DEF = libEOControl.def
 libEOControl_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
@@ -59,7 +63,18 @@ libEOControl_OBJC_FILES = \
        EOQualifierVariable.m           \
        NSObject+QualDesc.m             \
 
+# framework support
+EOControl_HEADER_FILES = $(libEOControl_HEADER_FILES)
+EOControl_OBJC_FILES   = $(libEOControl_OBJC_FILES)
+
+
+# building
+
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble
 -include fhs.make

diff --git a/sope-core/EOCoreData/GNUmakefile b/sope-core/EOCoreData/GNUmakefile
index f86d5ffa861c2cfdb0b587489012e3f4c0ae1e52..9273edf58dc8ae0eebef89b8ddc40e4221ae23ef 100644 (file)
--- a/sope-core/EOCoreData/GNUmakefile
+++ b/sope-core/EOCoreData/GNUmakefile
@@ -3,7 +3,11 @@
 -include ../../config.make
 include ../common.make
 
+ifneq ($(frameworks),yes)
 LIBRARY_NAME = libEOCoreData
+else
+FRAMEWORK_NAME = EOCoreData
+endif
 
 libEOCoreData_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 libEOCoreData_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
@@ -50,8 +54,18 @@ libEOCoreData_OBJC_FILES += \
        NSRelationshipDescription+EO.m          \
        NSManagedObject+KVC.m                   \
 
+# framework support
+EOCoreData_HEADER_FILES = $(libEOCoreData_HEADER_FILES)
+EOCoreData_OBJC_FILES   = $(libEOCoreData_OBJC_FILES)
+
+
+# building
 
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble
 -include fhs.make

diff --git a/sope-core/EOCoreData/GNUmakefile.preamble b/sope-core/EOCoreData/GNUmakefile.preamble
index b3213f0843d4c5e5e1ac0808b02b794d9ce6b5f1..62e1aff03c5d6ac56404f9c624fd7b7ec1227b30 100644 (file)
--- a/sope-core/EOCoreData/GNUmakefile.preamble
+++ b/sope-core/EOCoreData/GNUmakefile.preamble
@@ -6,20 +6,24 @@ libEOCoreData_INCLUDE_DIRS += -I..
 
 ADDITIONAL_CPPFLAGS += -Wall -funsigned-char
 
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+libEOCoreData_LIBRARIES_DEPEND_UPON += -lEOControl
+EOCoreData_LIBRARIES_DEPEND_UPON += -framework EOControl
+
+
+# library/framework search pathes
 
+DEP_DIRS = ../EOControl
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/..
-libEOCoreData_LIB_DIRS += \
-       -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
-libEOCoreData_LIB_DIRS += \
-       -L../EOControl/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-libEOCoreData_LIBRARIES_DEPEND_UPON += -lEOControl
-
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 
 # libFoundation, gstep-base
@@ -39,6 +43,7 @@ ifeq ($(FOUNDATION_LIB),apple)
 # TODO: libEOCoreData_PREBIND_ADDR="0xC1000000"
 ifneq ($(libEOCoreData_PREBIND_ADDR),)
 libEOCoreData_LDFLAGS += -seg1addr $(libEOCoreData_PREBIND_ADDR)
+EOCoreData_LDFLAGS += -seg1addr $(libEOCoreData_PREBIND_ADDR)
 endif
 
 ADDITIONAL_LDFLAGS += -framework CoreData

diff --git a/sope-core/NGExtensions/GNUmakefile b/sope-core/NGExtensions/GNUmakefile
index 19f1e3d85bdeaf0ff49e1593ed84c4df0e6a5445..faccdd7485db7317f64b67b4aca0bfc6eb17cf0d 100644 (file)
--- a/sope-core/NGExtensions/GNUmakefile
+++ b/sope-core/NGExtensions/GNUmakefile
@@ -3,7 +3,11 @@
 -include ../../config.make
 include ../common.make
 
+ifneq ($(frameworks),yes)
 LIBRARY_NAME = libNGExtensions
+else
+FRAMEWORK_NAME = NGExtensions
+endif
 
 libNGExtensions_DLL_DEF = libNGExtensions.def
 libNGExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
@@ -139,11 +143,23 @@ libNGExtensions_HEADER_FILES += \
        $(NGRuleEngine_HEADER_FILES)    \
        $(NGLogging_HEADER_FILES)
 
-ADDITIONAL_INCLUDE_DIRS += \
-       -I./NGExtensions/       \
-       -I./FdExt.subproj/ -I./EOExt.subproj/
+
+# framework support
+
+
+NGExtensions_HEADER_FILES_DIR = NGExtensions
+NGExtensions_HEADER_FILES = $(libNGExtensions_HEADER_FILES)
+NGExtensions_OBJC_FILES   = $(libNGExtensions_OBJC_FILES)
+NGExtensions_SUBPROJECTS  = $(libNGExtensions_SUBPROJECTS)
+
+
+# building
 
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble
 -include fhs.make

diff --git a/sope-core/NGExtensions/GNUmakefile.preamble b/sope-core/NGExtensions/GNUmakefile.preamble
index 377cca8bc71b580833c8a4eb0c57bbc134809e5b..5c3c0fb572a0b9523353b16aee9c3019831c58b7 100644 (file)
--- a/sope-core/NGExtensions/GNUmakefile.preamble
+++ b/sope-core/NGExtensions/GNUmakefile.preamble
@@ -1,22 +1,39 @@
 # compilation settings
 
+ADDITIONAL_INCLUDE_DIRS += \
+       -I./NGExtensions/       \
+       -I./FdExt.subproj/ -I./EOExt.subproj/
+
 ADDITIONAL_CPP_FLAGS     += -Wall -Wno-import -Wno-protocol -O2
 libNGExtensions_INCLUDE_DIRS += -I..
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
-libNGExtensions_LIB_DIRS += \
-       -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)      \
-       -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)
+# dependencies
+
+libNGExtensions_LIBRARIES_DEPEND_UPON += -lEOControl -lDOM -lSaxObjC -lz
+NGExtensions_LIBRARIES_DEPEND_UPON += \
+       -framework EOControl \
+       -framework DOM -framework SaxObjC \
+       -lz
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       ../EOControl \
+       ../../sope-xml/DOM ../../sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
-libNGExtensions_LIB_DIRS += \
-       -L../EOControl/$(GNUSTEP_OBJ_DIR) \
-       -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-libNGExtensions_LIBRARIES_DEPEND_UPON += -lEOControl -lDOM -lSaxObjC -lz
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 
 # Apple
 
@@ -25,6 +42,7 @@ libNGExtensions_PREBIND_ADDR="0xC1200000"
 libNGExtensions_LDFLAGS += -seg1addr $(libNGExtensions_PREBIND_ADDR)
 endif
 
+
 # platform specific settings
 
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)

diff --git a/sope-core/NGStreams/ChangeLog b/sope-core/NGStreams/ChangeLog
index d3171cbebad4771216f5488073f7e01b35f05405..b08c291953570c690b728a98fd26724dc5a21579 100644 (file)
--- a/sope-core/NGStreams/ChangeLog
+++ b/sope-core/NGStreams/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-10  Helge Hess  <helge.hess@opengroupware.org>
+
+       * reorganized inclusion to support frameworks (v4.5.49)
+
 2005-05-03  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGSocket.m (SockAddrLenType): fixed a Tiger warning (v4.5.48)

diff --git a/sope-core/NGStreams/GNUmakefile b/sope-core/NGStreams/GNUmakefile
index 000ea070b2d1e4a96373c1594fd5d4202c79e9c7..4fd79910f1650b6369d128190c0a42c0f759fda1 100644 (file)
--- a/sope-core/NGStreams/GNUmakefile
+++ b/sope-core/NGStreams/GNUmakefile
@@ -4,11 +4,16 @@
 include ../common.make
 include ./Version
 
+ifneq ($(frameworks),yes)
 LIBRARY_NAME = libNGStreams
+else
+FRAMEWORK_NAME = NGStreams
+endif
+
+libNGStreams_DLL_DEF                  = libNGStreams.def
 libNGStreams_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 libNGStreams_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
-libNGStreams_DLL_DEF                  = libNGStreams.def
 libNGStreams_HEADER_FILES_DIR         = NGStreams
 libNGStreams_HEADER_FILES_INSTALL_DIR = /NGStreams
 
@@ -90,7 +95,19 @@ libNGStreams_OBJC_FILES = \
        \
        NGGZipStream.m                  \
 
+# framework support
+NGStreams_HEADER_FILES_DIR = $(libNGStreams_HEADER_FILES_DIR)
+NGStreams_HEADER_FILES = $(libNGStreams_HEADER_FILES)
+NGStreams_OBJC_FILES   = $(libNGStreams_OBJC_FILES)
+
+
+# building
+
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble
 -include fhs.make

diff --git a/sope-core/NGStreams/GNUmakefile.preamble b/sope-core/NGStreams/GNUmakefile.preamble
index 19b71a122cf8116c4366868c55dc8504d39091bd..25f2e99a14bed69d331600ed40c8d35342b21cf6 100644 (file)
--- a/sope-core/NGStreams/GNUmakefile.preamble
+++ b/sope-core/NGStreams/GNUmakefile.preamble
@@ -1,37 +1,52 @@
 # compilation settings
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
-
-libNGStreams_LIB_DIRS += \
-       -L$(GNUSTEP_OBJ_DIR)                                            \
-       -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
-       -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)      \
-       -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)             \
-       -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
-else
-libNGStreams_LIB_DIRS += \
-       -L../NGExtensions/$(GNUSTEP_OBJ_DIR)    \
-       -L../EOControl/$(GNUSTEP_OBJ_DIR)
-endif
+libNGStreams_INCLUDE_DIRS += \
+       -I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \
+       -INGStreams             \
+       -I../NGExtensions       \
+       -I..
+
+NGStreams_INCLUDE_DIRS += $(libNGStreams_INCLUDE_DIRS)
+
+
+# dependencies
 
 libNGStreams_LIBRARIES_DEPEND_UPON += \
        -lNGExtensions -lEOControl      \
        -lDOM -lSaxObjC                 \
        -lz
+NGStreams_LIBRARIES_DEPEND_UPON += \
+       -framework NGExtensions -framework EOControl    \
+       -framework DOM -framework SaxObjC               \
+       -lz
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       ../NGExtensions \
+       ../EOControl    \
+       ../../sope-xml/DOM ../../sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
+else
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif
+
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
-libNGStreams_INCLUDE_DIRS += \
-       -I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \
-       -INGStreams             \
-       -I../NGExtensions       \
-       -I..
 
 # activating SSL support
 ifneq ($(ssl),no)
 libNGStreams_OBJC_FILES += NGActiveSSLSocket.m
+NGStreams_OBJC_FILES += NGActiveSSLSocket.m
 ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1 -DOPENSSL_NO_KRB5
 libNGStreams_LIBRARIES_DEPEND_UPON += -lssl -lcrypto
+NGStreams_LIBRARIES_DEPEND_UPON += -lssl -lcrypto
 endif
 
 ADDITIONAL_CPPFLAGS += -Wall -Wno-protocol
@@ -47,6 +62,7 @@ endif
 ifeq ($(FOUNDATION_LIB),apple)
 libNGStreams_PREBIND_ADDR="0xC1400000"
 libNGStreams_LDFLAGS += -seg1addr $(libNGStreams_PREBIND_ADDR)
+NGStreams_LDFLAGS += -seg1addr $(libNGStreams_PREBIND_ADDR)
 endif
 
 # Windows

diff --git a/sope-core/NGStreams/NGBase64Stream.m b/sope-core/NGStreams/NGBase64Stream.m
index 015a50246da720cca761199f945dfc2d6efd5320..ddf0e08115d66086403eccd6243a7fb29b7f45b7 100644 (file)
--- a/sope-core/NGStreams/NGBase64Stream.m
+++ b/sope-core/NGStreams/NGBase64Stream.m
@@ -19,9 +19,9 @@
   02111-1307, USA.
 */
 
+#include <NGStreams/NGBase64Stream.h>
+#include <NGStreams/NGCTextStream.h>
 #include "common.h"
-#include "NGBase64Stream.h"
-#include "NGCTextStream.h"
 
 static inline BOOL isbase64(char a) {
   if (('A' <= a) && (a <= 'Z')) return YES;

diff --git a/sope-core/NGStreams/NGBufferedStream.m b/sope-core/NGStreams/NGBufferedStream.m
index b36c548b3caf56736abbe87cf24923f8f87c0610..24c34ea10512b2f4000f131ab9f0fd028fa01758 100644 (file)
--- a/sope-core/NGStreams/NGBufferedStream.m
+++ b/sope-core/NGStreams/NGBufferedStream.m
@@ -19,8 +19,8 @@
   02111-1307, USA.
 */
 
+#include <NGStreams/NGBufferedStream.h>
 #include "common.h"
-#include "NGBufferedStream.h"
 
 #define NEWLINE_CHAR '\n'
 #define WRITE_WARN_SIZE (1024 * 1024 * 100) /* 100MB */

diff --git a/sope-core/NGStreams/NGByteCountStream.m b/sope-core/NGStreams/NGByteCountStream.m
index 281f0bd70b430c26d779d659c9750a9bb32d3cd1..3e134e7a7dc3283ba7db27f8a85241f692d038a2 100644 (file)
--- a/sope-core/NGStreams/NGByteCountStream.m
+++ b/sope-core/NGStreams/NGByteCountStream.m
@@ -19,8 +19,8 @@
   02111-1307, USA.
 */
 
+#include <NGStreams/NGByteCountStream.h>
 #include "common.h"
-#include "NGByteCountStream.h"
 
 @implementation NGByteCountStream
 

diff --git a/sope-core/NGStreams/NGCTextStream.m b/sope-core/NGStreams/NGCTextStream.m
index 2fe1a447eaade303108cf8c7eeead782d56c819e..a6b12f3cf92beb2d31e5e81e5b0793713c646911 100644 (file)
--- a/sope-core/NGStreams/NGCTextStream.m
+++ b/sope-core/NGStreams/NGCTextStream.m
@@ -19,11 +19,11 @@
   02111-1307, USA.
 */
 
-#import <NGExtensions/NGCharBuffers.h>
+#include <NGStreams/NGCTextStream.h>
+#include <NGStreams/NGStreamExceptions.h>
+#include <NGStreams/NGFileStream.h>
+#include <NGExtensions/NGCharBuffers.h>
 #include "common.h"
-#include "NGCTextStream.h"
-#include "NGStreamExceptions.h"
-#include "NGFileStream.h"
 
 static NSString *NGNewLineString = @"\n";
 

diff --git a/sope-core/NGStreams/NGConcreteStreamFileHandle.m b/sope-core/NGStreams/NGConcreteStreamFileHandle.m
index 5992716caca442ce4f480ab86714acadd5c6343f..48656a0407c44bf522b39e9c0620922c9d918727 100644 (file)
--- a/sope-core/NGStreams/NGConcreteStreamFileHandle.m
+++ b/sope-core/NGStreams/NGConcreteStreamFileHandle.m
@@ -20,11 +20,11 @@
 */
 
 #include <objc/objc-api.h>
+#include <NGStreams/NGConcreteStreamFileHandle.h>
+#include <NGStreams/NGStreamProtocols.h>
+#include <NGStreams/NGStreamExceptions.h>
+#include <NGStreams/NGBufferedStream.h>
 #include "common.h"
-#include "NGConcreteStreamFileHandle.h"
-#include "NGStreamProtocols.h"
-#include "NGStreamExceptions.h"
-#include "NGBufferedStream.h"
 
 @interface NGStream(FileHandleReset)
 

diff --git a/sope-core/NGStreams/NGDataStream.m b/sope-core/NGStreams/NGDataStream.m
index 90219546b7ba1fe805c89be326dcba7ddf658475..7a8fd2bf92c234d01754e51e1a6e2d3ea26100b1 100644 (file)
--- a/sope-core/NGStreams/NGDataStream.m
+++ b/sope-core/NGStreams/NGDataStream.m
@@ -19,8 +19,8 @@
   02111-1307, USA.
 */
 
-#include "NGDataStream.h"
-#include "NGStreamExceptions.h"
+#include <NGStreams/NGDataStream.h>
+#include <NGStreams/NGStreamExceptions.h>
 #include "common.h"
 
 // TODO: cache -bytes and -length of NSData for immutable data!

diff --git a/sope-core/NGStreams/NGFileStream.m b/sope-core/NGStreams/NGFileStream.m
index 4b99c1525f7ef6cdf306b857c9a379dfaca00ed8..2784d83881f5d268b64eea6e42f8b6c73f958160 100644 (file)
--- a/sope-core/NGStreams/NGFileStream.m
+++ b/sope-core/NGStreams/NGFileStream.m
@@ -34,14 +34,14 @@
 #  include <fcntl.h>
 #endif
 
+#include <NGStreams/NGFileStream.h>
+#include <NGStreams/NGBufferedStream.h>
+#include <NGStreams/NGConcreteStreamFileHandle.h>
+#include <NGStreams/NGLockingStream.h>
+#include <NGStreams/NGStreamExceptions.h>
+#include <NGStreams/NGDescriptorFunctions.h>
 #include "common.h"
 #import <Foundation/NSThread.h>
-#include "NGFileStream.h"
-#include "NGBufferedStream.h"
-#include "NGConcreteStreamFileHandle.h"
-#include "NGLockingStream.h"
-#include "NGStreamExceptions.h"
-#include "NGDescriptorFunctions.h"
 
 #if !defined(POLLRDNORM)
 #  define POLLRDNORM POLLIN

diff --git a/sope-core/NGStreams/NGFilterStream.m b/sope-core/NGStreams/NGFilterStream.m
index ff4760be859a7e697326fe7e4f20e1518d3f26f9..de6ca3baf372e874049ffa26b7310af2cbdd7072 100644 (file)
--- a/sope-core/NGStreams/NGFilterStream.m
+++ b/sope-core/NGStreams/NGFilterStream.m
@@ -19,8 +19,8 @@
   02111-1307, USA.
 */
 
+#include <NGStreams/NGFilterStream.h>
 #include "common.h"
-#include "NGFilterStream.h"
 
 @implementation NGFilterStream
 

diff --git a/sope-core/NGStreams/NGFilterTextStream.m b/sope-core/NGStreams/NGFilterTextStream.m
index 80f14bd0e4a6a6eda0a6efc81dd43c9390671d38..605ffb1f155d1271352d7a969d7ab98dc1ac944e 100644 (file)
--- a/sope-core/NGStreams/NGFilterTextStream.m
+++ b/sope-core/NGStreams/NGFilterTextStream.m
@@ -19,8 +19,8 @@
   02111-1307, USA.
 */
 
+#include <NGStreams/NGFilterTextStream.h>
 #include "common.h"
-#include "NGFilterTextStream.h"
 
 @implementation NGFilterTextStream
 

diff --git a/sope-core/NGStreams/NGLockingStream.m b/sope-core/NGStreams/NGLockingStream.m
index a9a3efe45989c8d964712a2f0c0652e13eff0468..33ea8a5b10b6e92e26af0d3cc7d623addf044bc5 100644 (file)
--- a/sope-core/NGStreams/NGLockingStream.m
+++ b/sope-core/NGStreams/NGLockingStream.m
@@ -19,8 +19,8 @@
   02111-1307, USA.
 */
 
+#include <NGStreams/NGLockingStream.h>
 #include "common.h"
-#include "NGLockingStream.h"
 
 @implementation NGLockingStream
 

diff --git a/sope-core/NGStreams/NGStream.m b/sope-core/NGStreams/NGStream.m
index 1a197a452ff743b3e285309cb7dc038cba571ef4..486b787f5ff0aaf30ee3cf8a3fdd4aa0a25115b2 100644 (file)
--- a/sope-core/NGStreams/NGStream.m
+++ b/sope-core/NGStreams/NGStream.m
@@ -19,10 +19,10 @@
   02111-1307, USA.
 */
 
+#include <NGStreams/NGStreamExceptions.h>
+#include <NGStreams/NGStream.h>
+#include <NGStreams/NGFilterStream.h>
 #include "common.h"
-#include "NGStreamExceptions.h"
-#include "NGStream.h"
-#include "NGFilterStream.h"
 
 @implementation NGStream
 

diff --git a/sope-core/NGStreams/NGStreams.m b/sope-core/NGStreams/NGStreams.m
index b9d4dc44f00d999d890e9d484dfa6cb81d14b9cb..1337908648fbfb7230b6044a8c3da528a6241aa5 100644 (file)
--- a/sope-core/NGStreams/NGStreams.m
+++ b/sope-core/NGStreams/NGStreams.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include "NGStreams.h"
+#include <NGStreams/NGStreams.h>
 
 @implementation NGStreams
 

diff --git a/sope-core/NGStreams/Version b/sope-core/NGStreams/Version
index 9c2df247a496f1acd4f3a8921372e447845bb7ef..704a8fa27d1346e21ef88404845e691f6c157dca 100644 (file)
--- a/sope-core/NGStreams/Version
+++ b/sope-core/NGStreams/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=48
+SUBMINOR_VERSION:=49

diff --git a/sope-core/NGStreams/common.h b/sope-core/NGStreams/common.h
index 76b4b74ae21e0b4298b0719dc063a5c877d73f77..2cc7d2a6ef966349c28d53dfc342a1ba7140c9c6 100644 (file)
--- a/sope-core/NGStreams/common.h
+++ b/sope-core/NGStreams/common.h
@@ -126,7 +126,7 @@
 
 // local common's
 
-#include "NGStreamExceptions.h"
+#include <NGStreams/NGStreamExceptions.h>
 
 @interface NSObject(OSXHacks)
 - (void)subclassResponsibility:(SEL)_acmd;

diff --git a/sope-core/samples/ChangeLog b/sope-core/samples/ChangeLog
index 16e2d2eb66ec100943b0e3ed2e5f9caa0e23ea69..5ffca0a874c0505df1c60dda48b01c7bd57a2a8e 100644 (file)
--- a/sope-core/samples/ChangeLog
+++ b/sope-core/samples/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-10  Helge Hess  <helge.hess@opengroupware.org>
+
+       * EOQualTool.m: fixed gcc 4.0 warnings
+
 2004-09-23  Helge Hess  <helge.hess@skyrix.com>
 
        * addd sope-rsrclookup.m tool for tetsing NGResourceLocator

diff --git a/sope-core/samples/EOQualTool.m b/sope-core/samples/EOQualTool.m
index 65f217ebd969572fd71980e716703e647c60a07f..60e9dced4a5672ab77511ba147ad31d66975ea5b 100644 (file)
--- a/sope-core/samples/EOQualTool.m
+++ b/sope-core/samples/EOQualTool.m
@@ -59,44 +59,49 @@
     [self printQualifier:q nesting:_level];
 }
 
-- (void)printQualifier:(id)_q nesting:(int)_level {
+- (void)printQualifier:(EOQualifier *)_q nesting:(int)_level {
   [self indent:_level];
   
   if ([_q isKindOfClass:[EOAndQualifier class]]) {
     printf("AND\n");
-    [self printQualifiers:[_q qualifiers] nesting:_level + 1];
+    [self printQualifiers:[(EOAndQualifier *)_q qualifiers] 
+         nesting:_level + 1];
   }
   else if ([_q isKindOfClass:[EOOrQualifier class]]) {
     printf("OR\n");
-    [self printQualifiers:[_q qualifiers] nesting:_level + 1];
+    [self printQualifiers:[(EOOrQualifier *)_q qualifiers] nesting:_level + 1];
   }
   else if ([_q isKindOfClass:[EONotQualifier class]]) {
     printf("NOT\n");
-    [self printQualifier:[_q qualifier] nesting:_level + 1];
+    [self printQualifier:[(EONotQualifier *)_q qualifier] nesting:_level + 1];
   }
   else if ([_q isKindOfClass:[EOKeyValueQualifier class]]) {
-    id v = [_q value];
+    id v = [(EOKeyValueQualifier *)_q value];
     printf("key OP value\n");
     _level++;
     [self indent:_level];
-    printf("key:   %s\n", [[_q key] cString]);
+    printf("key:   %s\n", [[(EOKeyValueQualifier *)_q key] cString]);
     [self indent:_level];
     printf("value: '%s' (class=%s)\n",
           [[v stringValue] cString],
           [NSStringFromClass([v class]) cString]);
     [self indent:_level];
-    printf("OP:    %s\n", [NSStringFromSelector([_q selector]) cString]);
+    printf("OP:    %s\n", 
+          [NSStringFromSelector([(EOKeyValueQualifier *)_q selector]) 
+                                cString]);
     _level--;
   }
   else if ([_q isKindOfClass:[EOKeyComparisonQualifier class]]) {
     printf("key1 OP key1\n");
     _level++;
     [self indent:_level];
-    printf("left:  %s\n", [[_q leftKey] cString]);
+    printf("left:  %s\n", [[(EOKeyComparisonQualifier *)_q leftKey] cString]);
     [self indent:_level];
-    printf("right: %s\n", [[_q rightKey] cString]);
+    printf("right: %s\n", [[(EOKeyComparisonQualifier *)_q rightKey] cString]);
     [self indent:_level];
-    printf("OP:    %s\n", [NSStringFromSelector([_q selector]) cString]);
+    printf("OP:    %s\n",
+          [NSStringFromSelector([(EOKeyComparisonQualifier *)_q selector]) 
+                               cString]);
     _level--;
   }
   else

diff --git a/sope-core/samples/GNUmakefile.preamble b/sope-core/samples/GNUmakefile.preamble
index 3ca7db781bcb695d51fae1ee22053a54030a3711..4d2c4635d23b06b1738e2b2c40299dd3294291ea 100644 (file)
--- a/sope-core/samples/GNUmakefile.preamble
+++ b/sope-core/samples/GNUmakefile.preamble
@@ -5,13 +5,31 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I../NGStreams          \
        -I../NGExtensions       \
 
-ADDITIONAL_LIB_DIRS += \
-       -L../EOControl/$(GNUSTEP_OBJ_DIR)    \
-       -L../NGExtensions/$(GNUSTEP_OBJ_DIR) \
-       -L../NGStreams/$(GNUSTEP_OBJ_DIR)    \
 
+ifneq ($(frameworks),yes)
 ADDITIONAL_TOOL_LIBS += \
        -lNGStreams -lNGExtensions -lEOControl  \
        -lDOM -lSaxObjC
+else
+ADDITIONAL_TOOL_LIBS += \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework DOM -framework SaxObjC
+endif
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       ../EOControl ../NGExtensions ../NGStreams \
+       ../../sope-xml/DOM ../../sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
+else
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib