fixed some NGMail framework build issue

[sope] / sope-appserver / NGObjWeb / GNUmakefile.preamble

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index fa95f4f69dc1348b2f536abc5e49d904dfa108e9..631196816e8cc459a9bf10fe8b47a9cb00af2d36 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -1,4 +1,10 @@
-# $Id: GNUmakefile.preamble 25 2004-08-20 23:01:07Z helge $
+# compilation settings
+
+ifeq ($(frameworks),yes)
+ADDITIONAL_CPPFLAGS += -DCOMPILE_AS_FRAMEWORK=1
+endif
+
+SOPE_ROOT=../..
 
 ADDITIONAL_CPPFLAGS += \
         -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
@@ -6,7 +12,7 @@ ADDITIONAL_CPPFLAGS += \
         -DSOPE_MINOR_VERSION=$(MINOR_VERSION)   \
         -DSOPE_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
 
-libNGObjWeb_CPPFLAGS  += -pipe -DCOMPILING_NGOBJWEB=1
+ADDITIONAL_CPPFLAGS  += -pipe -DCOMPILING_NGOBJWEB=1
 libNGObjWeb_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
 
 SOPE_ROOT=../..
@@ -23,45 +29,68 @@ ADDITIONAL_INCLUDE_DIRS += \
        -I$(SOPE_ROOT)/sope-mime
 
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
+# library/framework search pathes
 
+DEP_DIRS = \
+       $(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/DOM               \
+       $(SOPE_ROOT)/sope-xml/XmlRpc            \
+       $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
 ADDITIONAL_LIB_DIRS += \
-       -L./$(GNUSTEP_OBJ_DIR)                                          \
-       -L$(GNUSTEP_BUILD_DIR)/$(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)
+       $(foreach dir,$(DEP_DIRS),\
+         -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
-libNGObjWeb_LIB_DIRS += \
-       -L./$(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)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
+
+# dependencies
+
+ifneq ($(frameworks),yes)
+sope-xml-libs  = -lXmlRpc -lDOM -lSaxObjC
+sope-core-libs = -lNGStreams -lNGExtensions -lEOControl
+sope-mime-libs = -lNGMime
+sope-ngobjweb-libs = -lNGObjWeb
+else
+sope-xml-libs  = -framework XmlRpc -framework DOM -framework SaxObjC
+sope-core-libs = \
+  -framework NGStreams -framework NGExtensions -framework EOControl
+sope-mime-libs = -framework NGMime -framework NGMail
+sope-ngobjweb-libs = -framework NGObjWeb 
+endif
+
 libNGObjWeb_LIBRARIES_DEPEND_UPON += \
-       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC
+       $(sope-mime-libs) \
+       $(sope-core-libs) \
+       $(sope-xml-libs)
+NGObjWeb_LIBRARIES_DEPEND_UPON += \
+       $(sope-mime-libs) \
+       $(sope-core-libs)\
+       $(sope-xml-libs)
+
+
+ADDITIONAL_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS) -F.
 
-wod_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS)
 wod_TOOL_LIBS += \
-       -lNGObjWeb \
-       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC
+       $(sope-ngobjweb-libs)   \
+       $(sope-mime-libs)       \
+       $(sope-core-libs)       \
+       $(sope-xml-libs)
+SoCore_BUNDLE_LIBS += \
+       $(sope-ngobjweb-libs)   \
+       $(sope-mime-libs)       \
+       $(sope-core-libs)       \
+       $(sope-xml-libs)
+
 
 # platform specific settings
 
@@ -78,6 +107,7 @@ endif
 ifeq ($(FOUNDATION_LIB),apple)
 libNGObjWeb_PREBIND_ADDR="0xC4900000"
 libNGObjWeb_LDFLAGS += -seg1addr $(libNGObjWeb_PREBIND_ADDR)
+NGObjWeb_LDFLAGS += -seg1addr $(libNGObjWeb_PREBIND_ADDR)
 endif
 
 ifeq ($(FOUNDATION_LIB),nx)
@@ -85,3 +115,7 @@ wod_TOOL_LIBS += -lDOM -lSaxObjC -lFoundationExt
 wod_LDFLAGS += -framework Foundation
 libNGObjWeb_LIBRARIES_DEPEND_UPON += -lFoundationExt
 endif
+
+ifeq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3)
+wod_TOOL_LIBS += -liconv
+endif