9 files changed, 52 insertions, 30 deletions
diff --git a/web-gui/Makefile.am b/web-gui/Makefile.am
index 4ca8f21..e0304e9 100644
--- a/web-gui/Makefile.am
+++ b/web-gui/Makefile.am
@@ -3,6 +3,9 @@ SUBDIRS = \
 	hello-world \
 	calculator
 
+clean-local:
+	rm -rf qooxdoo-cache
+
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
diff --git a/web-gui/calculator/Makefile.am b/web-gui/calculator/Makefile.am
index af29dd7..92e5608 100644
--- a/web-gui/calculator/Makefile.am
+++ b/web-gui/calculator/Makefile.am
@@ -1,10 +1,29 @@
 
+QOOXDOO_SOURCE = \
+	Manifest.json \
+	generate.py \
+	source/resource/calculator/back.png \
+	source/script/calculator.js \
+	source/index.html \
+	source/translation/readme.txt \
+	source/class/calculator/Application.js \
+	source/class/calculator/test/DemoTest.js \
+	source/class/calculator/theme/Color.js \
+	source/class/calculator/theme/Theme.js \
+	source/class/calculator/theme/Decoration.js \
+	source/class/calculator/theme/Font.js \
+	source/class/calculator/theme/Appearance.js
+
 all:
-	if [ "@srcdir@" != "@builddir@" ]; then \
-		cp -a "@srcdir@/"{source,generate.py,Manifest.json} "@builddir@/"; \
-	fi
 	./generate.py build
 
+clean-local:
+	rm -rf build
+
+EXTRA_DIST = \
+	config.json.in \
+	$(QOOXDOO_SOURCE)
+
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
diff --git a/web-gui/calculator/config.json.in b/web-gui/calculator/config.json.in
index 73bc087..93c33c7 100644
--- a/web-gui/calculator/config.json.in
+++ b/web-gui/calculator/config.json.in
@@ -36,7 +36,8 @@
     "API_EXCLUDE"  : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"],
     "LOCALES"      : [ "en" ],
     "CACHE"        : "@abs_builddir@/../qooxdoo-cache",
-    "ROOT"         : "."
+    "BUILD_PATH"   : "@abs_builddir@/build",
+    "ROOT"         : "@abs_srcdir@"
   }
 
   // You only need to edit the remainder of this file, if you want to customize
diff --git a/web-gui/calculator/generate.py b/web-gui/calculator/generate.py.in
index 2d7794d..2e1f102 100755
--- a/web-gui/calculator/generate.py
+++ b/web-gui/calculator/generate.py.in
@@ -25,7 +25,7 @@
 import sys, os, re, subprocess
 
 CMD_PYTHON = 'python'
-QOOXDOO_PATH = '../../../../src/qooxdoo-1.1-sdk'
+QOOXDOO_PATH = '@QOOXDOO_SDK@'
 
 def getQxPath():
     path = QOOXDOO_PATH
diff --git a/web-gui/calculator/readme.txt b/web-gui/calculator/readme.txt
deleted file mode 100644
index a7b3d84..0000000
--- a/web-gui/calculator/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-GUI Skeleton - A qooxdoo Application Template
-=============================================
-
-This is a qooxdoo application skeleton which is used as a template. The 
-'create-application.py' script (usually under tool/bin/create-application.py)
-will use this and expand it into a self-contained qooxdoo application which 
-can then be further extended. Please refer to the script and other documentation
-for further information.
-
-short:: is a standard qooxdoo GUI application
-\ No newline at end of file
diff --git a/web-gui/hello-world/Makefile.am b/web-gui/hello-world/Makefile.am
index af29dd7..2f3d390 100644
--- a/web-gui/hello-world/Makefile.am
+++ b/web-gui/hello-world/Makefile.am
@@ -1,10 +1,28 @@
 
+QOOXDOO_SOURCE = \
+	Manifest.json \
+	generate.py \
+	source/resource/hello_world/back.png \
+	source/index.html \
+	source/translation/readme.txt \
+	source/class/hello_world/Application.js \
+	source/class/hello_world/test/DemoTest.js \
+	source/class/hello_world/theme/Color.js \
+	source/class/hello_world/theme/Theme.js \
+	source/class/hello_world/theme/Decoration.js \
+	source/class/hello_world/theme/Font.js \
+	source/class/hello_world/theme/Appearance.js
+
 all:
-	if [ "@srcdir@" != "@builddir@" ]; then \
-		cp -a "@srcdir@/"{source,generate.py,Manifest.json} "@builddir@/"; \
-	fi
 	./generate.py build
 
+clean-local:
+	rm -rf build
+
+EXTRA_DIST = \
+	config.json.in \
+	$(QOOXDOO_SOURCE)
+
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
diff --git a/web-gui/hello-world/config.json.in b/web-gui/hello-world/config.json.in
index 0952a8f..82e59af 100644
--- a/web-gui/hello-world/config.json.in
+++ b/web-gui/hello-world/config.json.in
@@ -36,7 +36,8 @@
     "API_EXCLUDE"  : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"],
     "LOCALES"      : [ "en" ],
     "CACHE"        : "@abs_builddir@/../qooxdoo-cache",
-    "ROOT"         : "."
+    "BUILD_PATH"   : "@abs_builddir@/build",
+    "ROOT"         : "@abs_srcdir@"
   }
 
   // You only need to edit the remainder of this file, if you want to customize
diff --git a/web-gui/hello-world/generate.py b/web-gui/hello-world/generate.py.in
index 2d7794d..2e1f102 100755
--- a/web-gui/hello-world/generate.py
+++ b/web-gui/hello-world/generate.py.in
@@ -25,7 +25,7 @@
 import sys, os, re, subprocess
 
 CMD_PYTHON = 'python'
-QOOXDOO_PATH = '../../../../src/qooxdoo-1.1-sdk'
+QOOXDOO_PATH = '@QOOXDOO_SDK@'
 
 def getQxPath():
     path = QOOXDOO_PATH
diff --git a/web-gui/hello-world/readme.txt b/web-gui/hello-world/readme.txt
deleted file mode 100644
index a7b3d84..0000000
--- a/web-gui/hello-world/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-GUI Skeleton - A qooxdoo Application Template
-=============================================
-
-This is a qooxdoo application skeleton which is used as a template. The 
-'create-application.py' script (usually under tool/bin/create-application.py)
-will use this and expand it into a self-contained qooxdoo application which 
-can then be further extended. Please refer to the script and other documentation
-for further information.
-
-short:: is a standard qooxdoo GUI application
-\ No newline at end of file