Wrote more...

[Rakka.git] / js / Makefile

diff --git a/js/Makefile b/js/Makefile
index d7e9959a975a2607b3b326cb6217a3dab200fb0b..689deeed31adb6c42462599fcf99dccb04b8715a 100644 (file)
--- a/js/Makefile
+++ b/js/Makefile
@@ -1,34 +1,31 @@
+JQUERY_SOURCE = jquery-1.2.1.js
+COMPRESSOR    = yuicompressor-2.2.4.jar
+
 SOURCES = \
-       jquery-1.2.1.js \
+       $(JQUERY_SOURCE) \
        jquery-dom.js \
        base.js \
        editPage.js \
+       screen.js \
        $(NULL)
 
-
-build: ../Rakka/Resource/JavaScript.hs
+COMPRESS = java -jar $(COMPRESSOR) --type js --charset UTF-8
 
 
-../Rakka/Resource/JavaScript.hs: $(SOURCES) yuicompressor.jar
-       cat $(SOURCES) > tmp.js
-       java -jar yuicompressor.jar --type js --charset UTF-8 -o tmp.packed.js --warn tmp.js
-       lucu-implant-file -o $@ -m Rakka.Resource.JavaScript -t text/javascript tmp.packed.js
-       rm tmp.js tmp.packed.js
+build: ../Rakka/Resource/JavaScript.hs
 
 
-jquery-dom.js:
-       @echo "Warning: jquery-dom.js is missing. Trying to download it..."
-       wget http://mg.to/files/jquery-dom.js
+packed.js: $(SOURCES) $(COMPRESSOR)
+#      cat $(SOURCES) > $@
+       cat $(SOURCES) | $(COMPRESS) --warn -o $@
 
 
-jquery-%.js:
-       @echo "Error: $@ has to be placed on this directory."
-       @echo "       See http://jquery.com/"
-       @exit 1
+../Rakka/Resource/JavaScript.hs: packed.js
+       lucu-implant-file -o $@ -m Rakka.Resource.JavaScript -t text/javascript packed.js
 
 
 clean:
-       rm -f ../Rakka/Resource/JavaScript.hs
+       rm -f ../Rakka/Resource/JavaScript.hs packed.js $(JQUERY_PACKED)
 
 
 yuicompressor.jar: