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 564fa022c908333a4f62b46d00bed530b303b595..bf1caf1c154fbb918919a2d7008d1d4dc984f802 100644 (file)
--- 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 165fee51fc185e1306a9fc655794ea3bce225a44..448fb1a5f58b57d39dd8d890c56263c32345f0d6 100644 (file)
--- 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 c3d3febb107095a39efea65bfcabf18b05f6002d..a51eeb0122db8c3803c9a253dded4629f5822f4b 100644 (file)
--- 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 7125f19e45e172c2a762a11d7207808164ffb93b..0f033d042a5ebe04a5af1a90699f1edc19090860 100644 (file)
--- 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