work on frameworks

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index f775f7c9789bfb9a4475283f1238d684974934c3..96730e222b78456e90852cf483197e81b3ca8be7 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-11  Helge Hess  <helge.hess@opengroupware.org>
+
+       * ngobjweb.make: added support for OSX frameworks (v4.5.186)
+
 2005-08-11  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * Defaults.plist: changed 'NGLogDefaultAppenderClass' from

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index d5165dbb8860a0fe16468dc8500fbee7cdccce7a..5751d673880b094f67d5d4a6a4605aee323e9a80 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=185
+SUBMINOR_VERSION:=186
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134

diff --git a/sope-appserver/NGObjWeb/ngobjweb.make b/sope-appserver/NGObjWeb/ngobjweb.make
index c8bdd44d2e859267bf9c2c44705d946c70dbf824..f59e0bcfd1d3a1df8667143143450c8b4b47c933 100644 (file)
--- a/sope-appserver/NGObjWeb/ngobjweb.make
+++ b/sope-appserver/NGObjWeb/ngobjweb.make
@@ -1,11 +1,31 @@
-# $Id: ngobjweb.make 14 2004-08-20 21:07:18Z helge $
+# settings for NGObjWeb based applications
 
 WO_LDFLAGS =
-WO_LIBS    = -lNGObjWeb -lNGMime -lNGStreams -lNGExtensions        
 WO_DEFINE  = -DNGObjWeb_LIBRARY=1
 
+ifneq ($(frameworks),yes)
+
+WO_LIBS    = -lNGObjWeb -lNGMime -lNGStreams -lNGExtensions        
+
 ifeq ($(FOUNDATION_LIB),apple)
 WO_LIBS += \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
 endif
+
+else
+
+WO_LIBS = \
+       -framework NGObjWeb     \
+       -framework NGMime       \
+       -framework NGStreams    \
+       -framework NGExtensions        
+
+ifeq ($(FOUNDATION_LIB),apple)
+WO_LIBS += \
+       -framework NGMime \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework XmlRpc -framework DOM -framework SaxObjC
+endif
+
+endif