fixed some NGMail framework build issue

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

diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble
index ffcb86573e19fa0cc9fe8c2e4981fd6d5f6b2de2..083f82041e2a71d8de497e29e5ab9d7d4c770a42 100644 (file)
--- a/sope-appserver/WEExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WEExtensions/GNUmakefile.preamble
@@ -1,4 +1,15 @@
-# $Id$
+# compiler flags
+
+SOPE_ROOT=../..
+
+ADDITIONAL_CPPFLAGS += -Wall
+ADDITIONAL_INCLUDE_DIRS += \
+       -I.. -I$(SOPE_ROOT) -I../NGObjWeb       \
+       -I$(SOPE_ROOT)/sope-core/NGStreams      \
+       -I$(SOPE_ROOT)/sope-core/NGExtensions   \
+       -I$(SOPE_ROOT)/sope-core                \
+       -I$(SOPE_ROOT)/sope-xml
+
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
 after-WEExtensions-all ::
@@ -11,50 +22,70 @@ after-WEExtensions-all ::
 endif
 
 libWEExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libWEExtensions_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
+
+
+# dependencies
 
 libWEExtensions_LIBRARIES_DEPEND_UPON += \
-       -lNGObjWeb -lNGJavaScript -lNGScripting \
-       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC \
-       -ljs
+       -lNGObjWeb      \
+       -lNGMime        \
+       -lNGStreams -lNGExtensions -lEOControl \
+       -lXmlRpc -lDOM -lSaxObjC
 
-ADDITIONAL_CPPFLAGS += -Wall
-ADDITIONAL_INCLUDE_DIRS += -I.. -I../.. -I../NGObjWeb
+ifeq ($(frameworks),yes)
+WEExtensions_LIBRARIES_DEPEND_UPON += \
+       -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_JS=$(GNUSTEP_BUILD_DIR)/../../../ThirdParty/js-1.5
-RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../skyrix-core
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../skyrix-xml
 
+# library/framework search pathes
+
+DEP_DIRS = \
+       ../NGObjWeb \
+       $(SOPE_ROOT)/sope-mime                  \
+       $(SOPE_ROOT)/sope-mime/NGMail           \
+       $(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$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)                \
-        -L$(RELBUILD_DIR_SOPE)/NGJavaScript/$(GNUSTEP_OBJ_DIR_NAME)    \
-        -L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)      \
-        -L$(RELBUILD_DIR_SxCore)/NGMime/$(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)                \
-       -L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME)
+       $(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../NGJavaScript/$(GNUSTEP_OBJ_DIR)    \
-        -L../NGScripting/$(GNUSTEP_OBJ_DIR)
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-WEExtensions_BUNDLE_LIBS   += -lWEExtensions
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
+
+# bundle dependencies
+
+ifneq ($(frameworks),yes)
+
+WEExtensions_BUNDLE_LIBS   += \
+       -lWEExtensions  \
+       -lNGObjWeb      \
+       -lNGMime        \
+       -lNGStreams -lNGExtensions -lEOControl \
+       -lXmlRpc -lDOM -lSaxObjC
 WEExtensions_WOBUNDLE_LIBS += $(WEExtensions_BUNDLE_LIBS)
+
 ifneq ($(GNUSTEP_BUILD_DIR),)
-WEExtensions_LIB_DIRS      += -L$(GNUSTEP_OBJ_DIR)
+WEExtensions_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR)
 else
-WEExtensions_LIB_DIRS      += -L./$(GNUSTEP_OBJ_DIR)
+WEExtensions_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
 endif
+endif
+
 
 # Apple