From e2606bc69056b155387408d32eebb67e999bb73b Mon Sep 17 00:00:00 2001
From: Ghislain Seguin <ghislain@gmail.com>
Date: Thu, 8 Dec 2011 14:22:23 -0800
Subject: [PATCH] Re-introduced structure CSS files Use YUICompressor for CSS
 compression as it is more efficient than r.js

---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 8d33b9ce..24104389 100644
--- a/Makefile
+++ b/Makefile
@@ -93,14 +93,18 @@ all: init css js zip notify
 # Build and minify the CSS files
 css: init
 	# Build the CSS file with the theme included
-	@@node js/r.js  -o cssIn=css/themes/default/jquery.mobile.theme.css out=${OUTPUT}/${NAME}.tmp.css
+	@@node js/r.js -o cssIn=css/themes/default/jquery.mobile.theme.css out=${OUTPUT}/${NAME}.compiled.css
 	@@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${NAME}.css
-	@@cat ${OUTPUT}/${NAME}.tmp.css >> ${OUTPUT}/${NAME}.css
-	@@rm ${OUTPUT}/${NAME}.tmp.css
-	@@node js/r.js  -o cssIn=css/themes/default/jquery.mobile.theme.css optimizeCss=standard out=${OUTPUT}/${NAME}.tmp.min.css
+	@@cat ${OUTPUT}/${NAME}.compiled.css >> ${OUTPUT}/${NAME}.css
 	@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.css
-	@@cat ${OUTPUT}/${NAME}.tmp.min.css >> ${OUTPUT}/${NAME}.min.css
-	@@rm ${OUTPUT}/${NAME}.tmp.min.css
+	@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${NAME}.compiled.css >> ${OUTPUT}/${NAME}.min.css
+	@@rm ${OUTPUT}/${NAME}.compiled.css
+	# Build the CSS Structure-only file
+	@@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${STRUCTURE}.css
+	@@cat ${CSSFILES} >> ${OUTPUT}/${STRUCTURE}.css
+	# ..... and then minify it
+	@@echo ${VER_MIN} > ${OUTPUT}/${STRUCTURE}.min.css
+	@@java -jar build/yuicompressor-2.4.6.jar --type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css
 	# ..... and then copy in the images
 	@@cp -R css/themes/${THEME}/images ${OUTPUT}/
 	# Css portion is complete.