Minor improvements to Page Speed build integration and documentation.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1194947 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 17 insertions, 18 deletions

diff --git a/sca-cpp/trunk/modules/edit/Makefile.am b/sca-cpp/trunk/modules/edit/Makefile.am
index 241d06d3f0..fa448904d7 100644
--- a/sca-cpp/trunk/modules/edit/Makefile.am
+++ b/sca-cpp/trunk/modules/edit/Makefile.am
@@ -20,21 +20,20 @@ if WANT_PYTHON
 moddir = $(prefix)/modules/edit
 dist_mod_SCRIPTS = start stop ssl-start mkapplinks
 
-nobase_dist_mod_DATA = edit.composite *.py htdocs/*.html htdocs/*.js htdocs/*.cmf htdocs/*.ico htdocs/home/*.png htdocs/home/*.b64 htdocs/*.txt htdocs/account/*.html htdocs/create/*.html htdocs/clone/*.html htdocs/app/*.html htdocs/store/*.html htdocs/stats/*.html htdocs/graph/*.html htdocs/home/*.html htdocs/page/*.html htdocs/login/*.html htdocs/logout/*.html htdocs/notauth/*.html htdocs/notfound/*.html htdocs/oops/*.html htdocs/public/*.html htdocs/public/*.png htdocs/public/*.b64 palettes/*/palette.composite apps/*/app.composite apps/*/app.stats apps/*/htdocs/app.html dashboards/*/user.apps store/*/store.apps
+minified = htdocs/public/iframe-min.html htdocs/create/index-min.html htdocs/page/index-min.html htdocs/login/index-min.html htdocs/notfound/index-min.html htdocs/oops/index-min.html htdocs/graph/index-min.html htdocs/notauth/index-min.html htdocs/account/index-min.html htdocs/home/index-min.html htdocs/index-min.html htdocs/notyet/index-min.html htdocs/clone/index-min.html htdocs/stats/index-min.html htdocs/app/index-min.html htdocs/logout/index-min.html htdocs/store/index-min.html htdocs/headconfig-min.js htdocs/footconfig-min.js
 
-EXTRA_DIST = edit.composite *.py htdocs/*.html htdocs/*.js htdocs/*.cmf htdocs/*.ico htdocs/home/*.png htdocs/home/*.b64 htdocs/*.txt htdocs/account/*.html htdocs/create/*.html htdocs/clone/*.html htdocs/app/*.html htdocs/store/*.html htdocs/stats/*.html htdocs/graph/*.html htdocs/home/*.html htdocs/page/*.html htdocs/login/*.html htdocs/logout/*.html htdocs/notauth/*.html htdocs/notfound/*.html htdocs/oops/*.html htdocs/public/*.html htdocs/public/*.png htdocs/public/*.b64 palettes/*/palette.composite apps/*/app.composite apps/*/app.stats apps/*/htdocs/app.html dashboards/*/user.apps store/*/store.apps
+resources = edit.composite *.py htdocs/*.html htdocs/*.js htdocs/*.cmf htdocs/*.ico htdocs/home/*.png htdocs/home/*.b64 htdocs/*.txt htdocs/account/*.html htdocs/create/*.html htdocs/clone/*.html htdocs/app/*.html htdocs/store/*.html htdocs/stats/*.html htdocs/graph/*.html htdocs/home/*.html htdocs/page/*.html htdocs/login/*.html htdocs/logout/*.html htdocs/notauth/*.html htdocs/notfound/*.html htdocs/oops/*.html htdocs/public/*.html htdocs/public/*.png htdocs/public/*.b64 palettes/*/palette.composite apps/*/app.composite apps/*/app.stats apps/*/htdocs/app.html dashboards/*/user.apps store/*/store.apps ${minified}
 
-BUILT_SOURCES = minify_html.stamp minify_js.stamp
-minify_html.stamp: htdocs/*.html htdocs/*/*.html
-	find htdocs -name "*-min.html" -exec rm {} \;
-	find htdocs -name "*.html" -exec ../http/minify-html {} \;
-	touch minify_html.stamp
+nobase_dist_mod_DATA = ${resources}
+EXTRA_DIST = ${resources}
 
-minify_js.stamp: htdocs/*.js
-	find htdocs -name "*-min.js" -exec rm {} \;
-	find htdocs -name "*.js" -exec ../http/minify-js {} \;
-	touch minify_js.stamp
+SUFFIXES = -min.html -min.js
+.html-min.html:
+	../http/minify-html $< $@
 
-CLEANFILES = *.stamp
+.js-min.js:
+	../http/minify-js $< $@
+
+CLEANFILES = ${minified}
 
 endif
diff --git a/sca-cpp/trunk/modules/http/minify-css b/sca-cpp/trunk/modules/http/minify-css
index e337f173c8..734d041aba 100755
--- a/sca-cpp/trunk/modules/http/minify-css
+++ b/sca-cpp/trunk/modules/http/minify-css
@@ -28,7 +28,7 @@ else
 fi
 
 css="$1"
-mincss="${css%.*}-min.css"
+mincss="$2"
 
 ${minify_css} <${css} >${mincss}
 
diff --git a/sca-cpp/trunk/modules/http/minify-html b/sca-cpp/trunk/modules/http/minify-html
index a1946d1190..31bb329d94 100755
--- a/sca-cpp/trunk/modules/http/minify-html
+++ b/sca-cpp/trunk/modules/http/minify-html
@@ -28,7 +28,7 @@ else
 fi
 
 html="$1"
-minhtml="${html%.*}-min.html"
+minhtml="$2"
 
 ${minify_html} ${html} ${minhtml}
 
diff --git a/sca-cpp/trunk/modules/http/minify-js b/sca-cpp/trunk/modules/http/minify-js
index 41fbe82224..5e7cbb1bc0 100755
--- a/sca-cpp/trunk/modules/http/minify-js
+++ b/sca-cpp/trunk/modules/http/minify-js
@@ -28,7 +28,7 @@ else
 fi
 
 js="$1"
-minjs="${js%.*}-min.js"
+minjs="$2"
 
 ${minify_js} <${js} >${minjs}
 
diff --git a/sca-cpp/trunk/modules/js/Makefile.am b/sca-cpp/trunk/modules/js/Makefile.am
index 1ef3fbd3ea..5b8e36a5cf 100644
--- a/sca-cpp/trunk/modules/js/Makefile.am
+++ b/sca-cpp/trunk/modules/js/Makefile.am
@@ -23,12 +23,12 @@ htdocs/all.js: htdocs/util.js htdocs/elemutil.js htdocs/xmlutil.js htdocs/atomut
 	cat htdocs/util.js htdocs/elemutil.js htdocs/xmlutil.js htdocs/atomutil.js htdocs/jsonutil.js htdocs/scdl.js htdocs/ui.js htdocs/component.js >htdocs/all.js
 
 htdocs/all-min.js: htdocs/all.js
-	../http/minify-js htdocs/all.js
+	../http/minify-js htdocs/all.js htdocs/all-min.js
 
 htdocs/ui-min.css: htdocs/ui.css
-	../http/minify-css htdocs/ui.css
+	../http/minify-css htdocs/ui.css htdocs/ui-min.css
 
-CLEANFILES = htdocs/all.js htdocs/all-min.js
+CLEANFILES = htdocs/all.js htdocs/all-min.js htdocs/ui-min.css
 
 moddir = $(prefix)/modules/js
 nobase_dist_mod_DATA = htdocs/*.js htdocs/*.css