From 069c0be318212adde1b2043489f05d0471d511ce Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Thu, 11 Aug 2005 14:44:38 +0000
Subject: [PATCH] added OSX framework support

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1029 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-appserver/NGXmlRpc/ChangeLog            |  4 ++
 sope-appserver/NGXmlRpc/GNUmakefile.preamble | 50 ++++++++++----------
 sope-appserver/NGXmlRpc/Version              |  2 +-
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog
index 9b6488ec..f179d04a 100644
--- a/sope-appserver/NGXmlRpc/ChangeLog
+++ b/sope-appserver/NGXmlRpc/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-11  Helge Hess  <helge.hess@opengroupware.org>
+
+	* GNUmakefile.preamble: added framework compilation for OSX (v4.5.12)
+
 2005-08-05  Helge Hess  <helge.hess@opengroupware.org>
 
 	* WODirectAction+XmlRpc.m: fixed gcc 4.0 warnings (v4.5.11)
diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
index 7fd90095..3f18f997 100644
--- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble
+++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble
@@ -20,40 +20,40 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I$(CORE_ROOT)/NGExtensions	\
 	-I$(SOPE_ROOT)/sope-xml
 
+
+# dependencies
+
 libNGXmlRpc_LIBRARIES_DEPEND_UPON += \
 	-lNGObjWeb \
 	-lNGMime -lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/$(CORE_ROOT)
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
+NGXmlRpc_LIBRARIES_DEPEND_UPON += \
+	-framework NGObjWeb \
+	-framework NGMime \
+	-framework NGStreams -framework NGExtensions -framework EOControl \
+	-framework XmlRpc -framework DOM -framework SaxObjC
 
-ADDITIONAL_LIB_DIRS += \
-	-L./$(GNUSTEP_OBJ_DIR)						\
-	-L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME)			\
-	-L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)		\
-	-L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME)		        \
-	-L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)	\
-	-L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)	\
-	-L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)	\
-	-L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)		\
-	-L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)		\
-	-L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
 
+# library/framework search pathes
+
+DEP_DIRS = \
+	../NGObjWeb \
+	$(SOPE_ROOT)/sope-mime			\
+	$(SOPE_ROOT)/sope-core/NGStreams	\
+	$(SOPE_ROOT)/sope-core/NGExtensions	\
+	$(SOPE_ROOT)/sope-core/EOControl	\
+	$(SOPE_ROOT)/sope-xml/XmlRpc		\
+	$(SOPE_ROOT)/sope-xml/DOM		\
+	$(SOPE_ROOT)/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 += \
-	-L./$(GNUSTEP_OBJ_DIR)					\
-	-L../NGObjWeb/$(GNUSTEP_OBJ_DIR)			\
-	-L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR)		\
-	-L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR)		\
-	-L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR)		\
-	-L$(CORE_ROOT)/EOControl/$(GNUSTEP_OBJ_DIR)		\
-	-L$(SOPE_ROOT)/sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)	\
-	-L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR)		\
-	-L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
+	$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version
index d4260269..81248043 100644
--- a/sope-appserver/NGXmlRpc/Version
+++ b/sope-appserver/NGXmlRpc/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12
-- 
2.39.5