From 2e5abd585874b18d5e94067ca7704a1966df3226 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 26 Aug 2013 03:04:34 +0000 Subject: Refactor base Javascript and CSS utilities and support server-side aggregation of HTML and Javascript. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1517415 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/modules/js/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'sca-cpp/trunk/modules/js/Makefile.am') diff --git a/sca-cpp/trunk/modules/js/Makefile.am b/sca-cpp/trunk/modules/js/Makefile.am index 2d1efea1dd..c4e68d6e31 100644 --- a/sca-cpp/trunk/modules/js/Makefile.am +++ b/sca-cpp/trunk/modules/js/Makefile.am @@ -18,11 +18,14 @@ jsfiles = htdocs/util.js htdocs/elemutil.js htdocs/xmlutil.js htdocs/atomutil.js htdocs/jsonutil.js htdocs/scdl.js htdocs/ui.js htdocs/component.js -BUILT_SOURCES = htdocs/all.js +BUILT_SOURCES = htdocs/base.js htdocs/all.js +htdocs/base.js: htdocs/util.js htdocs/ui.js + cat $^ >htdocs/base.js + htdocs/all.js: ${jsfiles} cat $^ >htdocs/all.js -minified = htdocs/all-min.js htdocs/ui-min.css +minified = htdocs/all-min.js htdocs/base-min.js htdocs/ui-min.css SUFFIXES = -min.html -min.js -min.css .html-min.html: @@ -34,9 +37,9 @@ SUFFIXES = -min.html -min.js -min.css .css-min.css: ../../modules/http/minify-css $< $@ -CLEANFILES = htdocs/all.js ${minified} +CLEANFILES = htdocs/base.js htdocs/all.js ${minified} -dist_mod_SCRIPTS = js-conf +dist_mod_SCRIPTS = js-conf js-extract moddir = $(prefix)/modules/js nobase_dist_mod_DATA = ${minified} EXTRA_DIST = ${jsfiles} htdocs/ui.css -- cgit v1.2.3