From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 20 Feb 2006 00:59:16 +0000 (+0000)
Subject: fixed makefile
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43f02c0400e3e57f5fcb40ec06769ff5eea85293;p=sope

fixed makefile


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

diff --git a/sope-appserver/WEPrototype/ChangeLog b/sope-appserver/WEPrototype/ChangeLog
index 564fa022..bf1caf1c 100644
--- a/sope-appserver/WEPrototype/ChangeLog
+++ b/sope-appserver/WEPrototype/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-20  Helge Hess  <helge.hess@opengroupware.org>
+
+	* GNUmakefile: link WEPrototypeElemBuilder into libWEPrototype,
+	  properly protect framework settings (v4.5.7)
+
 2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
 
 	* GNUmakefile.preamble: fixed for framework compilation (v4.5.6)
diff --git a/sope-appserver/WEPrototype/GNUmakefile b/sope-appserver/WEPrototype/GNUmakefile
index 165fee51..448fb1a5 100644
--- a/sope-appserver/WEPrototype/GNUmakefile
+++ b/sope-appserver/WEPrototype/GNUmakefile
@@ -28,16 +28,19 @@ libWEPrototype_OBJC_FILES = \
 	WEPrototypeScriptAction.m	\
 	WEPrototypeScript.m		\
 	WELiveLink.m			\
+	WEPrototypeElemBuilder.m	\
 
 WEPrototype_OBJC_FILES      = WEPrototypeBundle.m
 WEPrototype_PRINCIPAL_CLASS = WEPrototypeBundle
 
 # framework support
 
+ifeq ($(frameworks),yes)
 WEPrototype_HEADER_FILES_DIR = WEPrototype
 WEPrototype_HEADER_FILES = $(libWEPrototype_HEADER_FILES)
 WEPrototype_OBJC_FILES   = $(libWEPrototype_OBJC_FILES)
 WEPrototype_SUBPROJECTS  = $(libWEPrototype_SUBPROJECTS)
+endif
 
 
 # building
diff --git a/sope-appserver/WEPrototype/Version b/sope-appserver/WEPrototype/Version
index c3d3febb..a51eeb01 100644
--- a/sope-appserver/WEPrototype/Version
+++ b/sope-appserver/WEPrototype/Version
@@ -1,5 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=7
 
 # v4.5.1 requires libNGObjWeb v4.5.170
diff --git a/sope-appserver/WEPrototype/WEPrototypeElemBuilder.m b/sope-appserver/WEPrototype/WEPrototypeElemBuilder.m
index 7125f19e..0f033d04 100644
--- a/sope-appserver/WEPrototype/WEPrototypeElemBuilder.m
+++ b/sope-appserver/WEPrototype/WEPrototypeElemBuilder.m
@@ -27,6 +27,7 @@
   All tags are mapped into the <var:> namespace (XMLNS_OD_BIND).
 
   Supported tags:
+    var:live-link => WELiveLink
 */
 
 @interface WEPrototypeElemBuilder : WOxTagClassElemBuilder