added OSX framework support

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

diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog
index 9b6488eceb130a6a72e1e364d09f9a1f099c3d11..f179d04aaa2972c6c5ceb170eee519e07022ab49 100644 (file)
--- 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 7fd90095d0e54b895828bea3055237daf71be904..3f18f99761a6d8c7afa99f6bd8170102ca1e0d23 100644 (file)
--- 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 d4260269633d8348fd2a8fb191f1d3f83666f26a..8124804373d676be64906a721553e0ae765a21a2 100644 (file)
--- a/sope-appserver/NGXmlRpc/Version
+++ b/sope-appserver/NGXmlRpc/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12