change layout, factor out css, use lesscss

[hexbog.git] / Makefile

diff --git a/Makefile b/Makefile
index 1aba240..9807ae8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,15 +9,21 @@ wordlist_compressed.js: compress.coffee wordlist.txt
 main.js: main.coffee
        coffee -bc main.coffee
 
-all_min.js: wordlist_compressed.js main.js
-       cat /usr/share/javascript/jquery/jquery.min.js main.js wordlist_compressed.js | uglifyjs -nc -o all_min.js
+main_min.js: wordlist_compressed.js main.js
+       cat /usr/share/javascript/jquery/jquery.min.js main.js | uglifyjs -nc -o $@
 
-index.html: all_min.js main.html
-       (head -n -2 main.html; echo '<script>'; cat all_min.js; echo '</script>'; tail -n 2 main.html) > index.html
+wordlist_min.js: wordlist_compressed.js main.js
+       cat wordlist_compressed.js | uglifyjs -nc -o $@
+
+style.css: style.less
+       lessc style.less style.css
+
+index.html: main_min.js wordlist_min.js main.html style.css
+       bash combine.bash main.html > $@ || (rm -f $@; exit 1)
 
 index.html.gz: index.html
        gzip --best -c $< > $@
 
 
 clean:
-       rm -f main.js all_min.js wordlist_compressed.js index.html index.html.gz
+       rm -f main.js main_min.js wordlist_compressed.js wordlist_min.js style.css index.html index.html.gz