From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Wed, 17 Aug 2005 16:10:23 +0000 (+0000)
Subject: prepared appserver umbrella
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7dde525e5fad59fa831d1970ed5e159c644150d;p=sope

prepared appserver umbrella


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

diff --git a/sope-appserver/dummy.c b/sope-appserver/dummy.c
new file mode 100644
index 00000000..400df953
--- /dev/null
+++ b/sope-appserver/dummy.c
@@ -0,0 +1,30 @@
+/*
+  Copyright (C) 2000-2005 SKYRIX Software AG
+
+  This file is part of SOPE.
+
+  SOPE is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with SOPE; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+
+/*
+  this is required by the "fake" frameworks NGImap4 and NGMail, otherwise
+  linking will fail with:
+  ---snip---
+  ld: /Users/helge/build/NGImap4.framework/NGImap4 tocoff in load command 7 extends past the end of the file
+  ld: /Users/helge/build/NGMail.framework/NGMail tocoff in load command 7 extends past the end of the file
+  ---snap---
+*/
+
diff --git a/sope-appserver/umbrella.make b/sope-appserver/umbrella.make
new file mode 100644
index 00000000..86fa3915
--- /dev/null
+++ b/sope-appserver/umbrella.make
@@ -0,0 +1,57 @@
+# build umbrella framework for this subproject
+
+ifeq ($(frameworks),yes)
+
+FRAMEWORK_NAME = sope-appserver
+
+sope-appserver_C_FILES = dummy.c
+
+sope-appserver_UMBRELLA_FRAMEWORKS = \
+	sope-xml	\
+	sope-core	\
+	NGObjWeb	\
+	WEExtensions	\
+	WOExtensions	\
+	WOXML		\
+	SoOFS		\
+	NGXmlRpc	\
+
+sope-appserver_PREBIND_ADDR = # TODO
+sope-appserver_INSTALL_DIR  = /Library/Frameworks/
+
+
+# generic (consolidate in gstep-make)
+$(FRAMEWORK_NAME)_LDFLAGS += \
+	$(foreach fwname,$($(FRAMEWORK_NAME)_UMBRELLA_FRAMEWORKS),\
+          -framework $(fwname)) \
+	$(foreach fwname,$($(FRAMEWORK_NAME)_UMBRELLA_FRAMEWORKS),\
+          -sub_umbrella $(fwname)) \
+	-headerpad_max_install_names
+
+ifneq ($($(FRAMEWORK_NAME)_PREBIND_ADDR),)
+$(FRAMEWORK_NAME)_LDFLAGS += -seg1addr $($(FRAMEWORK_NAME)_PREBIND_ADDR)
+endif
+
+
+# library/framework search pathes
+
+DEP_DIRS += \
+	../sope-core			\
+	../sope-xml			\
+	../sope-core/EOControl		\
+	../sope-core/NGExtensions	\
+	../sope-core/NGStreams		\
+	../sope-xml/DOM			\
+	../sope-xml/XmlRpc		\
+	../sope-xml/SaxObjC		\
+	NGObjWeb	\
+	WEExtensions	\
+	WOExtensions	\
+	WOXML		\
+	SoOFS		\
+	NGXmlRpc	\
+
+ADDITIONAL_LIB_DIRS += \
+	$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+
+endif
diff --git a/sope-core/umbrella.make b/sope-core/umbrella.make
index cfbd5f80..a0bd3d56 100644
--- a/sope-core/umbrella.make
+++ b/sope-core/umbrella.make
@@ -13,7 +13,7 @@ sope-core_UMBRELLA_FRAMEWORKS = \
 	NGExtensions	\
 	NGStreams	\
 
-sope-core_PREBIND_ADDR = 0xC0FF0000
+sope-core_PREBIND_ADDR = # TODO
 sope-core_INSTALL_DIR  = /Library/Frameworks/