From c6f543eaee04a481aa2656047f12c2bc362f417f Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 18 Sep 2005 17:25:08 +0000
Subject: [PATCH] added framework compilation

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1113 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-appserver/WEPrototype/ChangeLog          |  4 +
 sope-appserver/WEPrototype/GNUmakefile        |  8 +-
 .../WEPrototype/GNUmakefile.preamble          | 76 ++++++++++++-------
 sope-appserver/WEPrototype/Version            |  2 +-
 4 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/sope-appserver/WEPrototype/ChangeLog b/sope-appserver/WEPrototype/ChangeLog
index c14ab15e..564fa022 100644
--- a/sope-appserver/WEPrototype/ChangeLog
+++ b/sope-appserver/WEPrototype/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+	* GNUmakefile.preamble: fixed for framework compilation (v4.5.6)
+
 2005-09-15  Helge Hess  <helge.hess@opengroupware.org>
 
 	* GNUmakefile.preamble, GNUmakefile.postamble: moved targets from
diff --git a/sope-appserver/WEPrototype/GNUmakefile b/sope-appserver/WEPrototype/GNUmakefile
index f160fdec..eaff0c9a 100644
--- a/sope-appserver/WEPrototype/GNUmakefile
+++ b/sope-appserver/WEPrototype/GNUmakefile
@@ -7,15 +7,13 @@ include ./Version
 
 ifneq ($(frameworks),yes)
 LIBRARY_NAME   = libWEPrototype
-else
-FRAMEWORK_NAME = WEPrototype
-endif
-
 
-# TODO: can we save the .wox with frameworks?
 BUNDLE_NAME      = WEPrototype
 BUNDLE_EXTENSION = .wox
 BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+else
+FRAMEWORK_NAME = WEPrototype
+endif
 
 FHS_MANPAGES += doc/*.3
 
diff --git a/sope-appserver/WEPrototype/GNUmakefile.preamble b/sope-appserver/WEPrototype/GNUmakefile.preamble
index 0fc772c2..72225ddf 100644
--- a/sope-appserver/WEPrototype/GNUmakefile.preamble
+++ b/sope-appserver/WEPrototype/GNUmakefile.preamble
@@ -1,19 +1,24 @@
 # compiler flags
 
+SOPE_ROOT=../..
 
+# TODO: remove for framework builds?
 ADDITIONAL_CPPFLAGS += \
-        -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
+        -DCOMPILE_FOR_GSTEP_MAKE=1
+
+ADDITIONAL_CPPFLAGS += \
+        -Wall \
         -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION)   \
         -DSOPE_MINOR_VERSION=$(MINOR_VERSION)   \
         -DWEP_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
 
 ADDITIONAL_CPPFLAGS += -Wall
 ADDITIONAL_INCLUDE_DIRS += \
-	-I.. -I../.. -I../NGObjWeb	\
-	-I../../sope-core/NGStreams	\
-	-I../../sope-core/NGExtensions	\
-	-I../../sope-core		\
-	-I../../sope-xml
+	-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
 
 
 libWEPrototype_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
@@ -25,35 +30,45 @@ libWEPrototype_LIBRARIES_DEPEND_UPON += \
 	-lNGStreams -lNGExtensions -lEOControl \
 	-lXmlRpc -lDOM -lSaxObjC
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_APPSERVER=$(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
 
+ifeq ($(frameworks),yes)
+WEPrototype_LIBRARIES_DEPEND_UPON += \
+	-framework NGObjWeb	\
+	-framework NGMime -framework NGMail \
+	-framework NGStreams -framework NGExtensions -framework EOControl \
+	-framework XmlRpc -framework DOM -framework SaxObjC
+endif
+
+
+# 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_APPSERVER)/NGObjWeb/$(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
 ADDITIONAL_LIB_DIRS += \
-	-L./$(GNUSTEP_OBJ_DIR)                  		\
-        -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)        		\
-        -L../../sope-mime/$(GNUSTEP_OBJ_DIR)			\
-        -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)		\
-        -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR)	\
-        -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)		\
-        -L../../sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)		\
-        -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)			\
-        -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
+	$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
+
+# bundle dependencies
+
+ifneq ($(frameworks),yes)
+
 WEPrototype_BUNDLE_LIBS   += \
 	-lWEPrototype	\
 	-lNGObjWeb	\
@@ -68,6 +83,9 @@ else
 WEPrototype_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
 endif
 
+endif
+
+
 # Apple
 
 #ifeq ($(FOUNDATION_LIB),apple)
diff --git a/sope-appserver/WEPrototype/Version b/sope-appserver/WEPrototype/Version
index 9d336640..c3d3febb 100644
--- a/sope-appserver/WEPrototype/Version
+++ b/sope-appserver/WEPrototype/Version
@@ -1,5 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=5
+SUBMINOR_VERSION:=6
 
 # v4.5.1 requires libNGObjWeb v4.5.170
-- 
2.39.5