From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 9 Aug 2005 23:47:36 +0000 (+0000)
Subject: added OSX framework support
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3111c3bce29d2a811ee3cb1d3923096cb32a4ff8;p=sope

added OSX framework support


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

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 5cb7ba38..3b524172 100644
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-10  Helge Hess  <helge.hess@opengroupware.org>
+
+	* added OSX framework support (v4.5.232)
+
 2005-07-27  Helge Hess  <helge.hess@skyrix.com>
 
 	* NGImap4: fixed a gcc 4.0 warning (v4.5.231)
diff --git a/sope-mime/GNUmakefile b/sope-mime/GNUmakefile
index 1966c563..327e76c1 100644
--- a/sope-mime/GNUmakefile
+++ b/sope-mime/GNUmakefile
@@ -6,7 +6,11 @@ include ./Version
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
 
+ifneq ($(frameworks),yes)
 LIBRARY_NAME = libNGMime
+else
+FRAMEWORK_NAME = NGMime
+endif
 
 libNGMime_HEADER_FILES_DIR         = .
 libNGMime_HEADER_FILES_INSTALL_DIR = /NGMime
@@ -15,11 +19,21 @@ libNGMime_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libNGMime_SUBPROJECTS = NGMime NGMail NGImap4
 
-ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
-		       -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
-		       -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
+
+# framework support
+
+NGMime_HEADER_FILES = $(libNGMime_HEADER_FILES)
+NGMime_OBJC_FILES   = $(libNGMime_OBJC_FILES)
+NGMime_SUBPROJECTS  = $(libNGMime_SUBPROJECTS)
+
+
+# building
 
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble
 -include fhs.make
diff --git a/sope-mime/GNUmakefile.preamble b/sope-mime/GNUmakefile.preamble
index 59aef0dc..b3247d8d 100644
--- a/sope-mime/GNUmakefile.preamble
+++ b/sope-mime/GNUmakefile.preamble
@@ -1,35 +1,49 @@
-# $Id$
+# compilation settings
 
-ADDITIONAL_CPPFLAGS += -Wall
+ifeq ($(FOUNDATION_LIB),apple)
+NGMime_INSTALL_DIR = /Library/Frameworks/
+endif
 
-libNGMime_LIBRARIES_DEPEND_UPON += \
-	-lNGStreams -lNGExtensions -lEOControl	\
-	-lDOM -lSaxObjC
+ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
+		       -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
+		       -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
+
+ADDITIONAL_CPPFLAGS += -Wall
 
 libNGMime_INCLUDE_DIRS += \
 	-I..	\
 	-I../sope-core/NGStreams/	\
 	-I../sope-core/NGExtensions/
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../sope-core
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../sope-xml
 
-libNGMime_LIB_DIRS += \
-	-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)/DOM/$(GNUSTEP_OBJ_DIR_NAME)		\
-	-L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
+libNGMime_LIBRARIES_DEPEND_UPON += \
+	-lNGStreams -lNGExtensions -lEOControl	\
+	-lDOM -lSaxObjC
+
+NGMime_LIBRARIES_DEPEND_UPON += \
+	-framework NGStreams -framework NGExtensions -framework EOControl \
+	-framework DOM -framework SaxObjC
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+	../sope-core/EOControl ../sope-core/NGExtensions \
+	../sope-core/NGStreams \
+	../sope-xml/DOM ../sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+	$(foreach dir,$(DEP_DIRS),\
+	  -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
-libNGMime_LIB_DIRS += \
-	-L../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)	\
-	-L../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR)	\
-	-L../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)	\
-	-L../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)		\
-	-L../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
+
+
 
 # Apple
 
diff --git a/sope-mime/Version b/sope-mime/Version
index 0fb50bf3..29764297 100644
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=231
+SUBMINOR_VERSION:=232
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34