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 6150111fa7e0e9ad482e061f9c36ef08e1654f6e..631196816e8cc459a9bf10fe8b47a9cb00af2d36 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -32,6 +32,7 @@ ADDITIONAL_INCLUDE_DIRS += \
 # 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     \
@@ -54,28 +55,41 @@ 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 += \
-       -framework NGMime -framework NGMail \
-       -framework NGStreams -framework NGExtensions -framework EOControl \
-       -framework XmlRpc -framework DOM -framework SaxObjC
+       $(sope-mime-libs) \
+       $(sope-core-libs)\
+       $(sope-xml-libs)
+
+
+ADDITIONAL_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS) -F.
 
-wod_LIB_DIRS  += $(libNGObjWeb_LIB_DIRS) -F.
-ifneq ($(frameworks),yes)
-wod_TOOL_LIBS += \
-       -lNGObjWeb \
-       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC
-else
 wod_TOOL_LIBS += \
-       -framework NGObjWeb \
-       -framework NGMime \
-       -framework NGStreams -framework NGExtensions -framework EOControl \
-       -framework XmlRpc -framework DOM -framework SaxObjC
-endif
+       $(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