X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=js%2FMakefile;h=f8f2f2833fb0508aa0750471585764f8837b0bb4;hb=0447be1b59496ca4266226ed52d264009cf41899;hp=a5c163b11b746c2cbc073e117d11417878ece1e4;hpb=859d4378c2e2a1ccc8028821a37eeaa43aaa23fb;p=Rakka.git

diff --git a/js/Makefile b/js/Makefile
index a5c163b..f8f2f28 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -1,26 +1,35 @@
+JQUERY_SOURCE = jquery-1.2.2.js
+COMPRESSOR    = yuicompressor-2.2.5.jar
+
 SOURCES = \
-	jquery-1.2.1.js \
+	$(JQUERY_SOURCE) \
+	jquery-dom.js \
+	base.js \
+	base64.js \
+	editPage.js \
+	localFile.js \
+	login.js \
+	redirection.js \
+	screen.js \
 	$(NULL)
 
+COMPRESS = java -jar $(COMPRESSOR) --type js --charset UTF-8
+
 
 build: ../Rakka/Resource/JavaScript.hs
 
 
-../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
+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: