fixed some NGMail framework build issue

[sope] / xmlrpc_call / GNUmakefile.preamble

diff --git a/xmlrpc_call/GNUmakefile.preamble b/xmlrpc_call/GNUmakefile.preamble
index 16c652672f017beb79df7218d020c463ee77a4a6..2fb24c1d8694fda193f6855786481374fb135ed6 100644 (file)
--- a/xmlrpc_call/GNUmakefile.preamble
+++ b/xmlrpc_call/GNUmakefile.preamble
@@ -1,15 +1,12 @@
-# $Id$
+# compilation settings
 
 SOPE_ROOT=..
 CORE_ROOT=$(SOPE_ROOT)/sope-core
 APPSERVER_ROOT=$(SOPE_ROOT)/sope-appserver
 
-ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
+ADDITIONAL_CPPFLAGS  += -Wall
 ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 
-ADDITIONAL_CPPFLAGS += -pipe -Wall
-ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1
-
 ADDITIONAL_INCLUDE_DIRS += \
        -I.. -I. -I../..        \
         -I$(APPSERVER_ROOT)/NGObjWeb/  \
@@ -19,45 +16,51 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I$(CORE_ROOT)/NGExtensions     \
        -I$(SOPE_ROOT)/sope-xml
 
-libNGXmlRpc_LIBRARIES_DEPEND_UPON += \
-       -lNGObjWeb \
-       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC
 
+# dependencies
+
+ifneq ($(frameworks),yes)
 xmlrpc_call_TOOL_LIBS += \
        -lNGXmlRpc -lNGObjWeb \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC
+else
+xmlrpc_call_TOOL_LIBS += \
+       -framework NGXmlRpc -framework NGObjWeb \
+       -framework NGMime \
+       -framework NGMail \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework XmlRpc -framework DOM -framework SaxObjC
+endif
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../sope-appserver
-RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../sope-mime
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/$(CORE_ROOT)
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../sope-xml
 
-ADDITIONAL_LIB_DIRS += \
-       -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME)                  \
-       -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)         \
-       -L$(RELBUILD_DIR_SOPE)/NGXmlRpc/$(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 = \
+       $(SOPE_ROOT)/sope-appserver/NGXmlRpc    \
+       $(SOPE_ROOT)/sope-appserver/NGObjWeb    \
+       $(SOPE_ROOT)/sope-mime/NGMail           \
+       $(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$(APPSERVER_ROOT)/NGXmlRpc/$(GNUSTEP_OBJ_DIR)         \
-       -L$(APPSERVER_ROOT)/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
 
-ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
+
+# OS dependend stuff
+ifeq ($(findstring openbsd3, $(GNUSTEP_HOST_OS)), openbsd3)
+xmlrpc_call_TOOL_LIBS += -liconv
+endif