jQuery 1.2.2 -> 1.2.6

[Rakka.git] / js / Makefile

diff --git a/js/Makefile b/js/Makefile
index 689deeed31adb6c42462599fcf99dccb04b8715a..ccd88fb2accf85687721a821afe2c5df0019163c 100644 (file)
--- a/js/Makefile
+++ b/js/Makefile
@@ -1,12 +1,20 @@
-JQUERY_SOURCE = jquery-1.2.1.js
-COMPRESSOR    = yuicompressor-2.2.4.jar
+JQUERY_SOURCE = jquery-1.2.6.js
+COMPRESSOR    = yuicompressor-2.3.5.jar
 
 SOURCES = \
        $(JQUERY_SOURCE) \
        jquery-dom.js \
        base.js \
+       base64.js \
        editPage.js \
+       localFile.js \
+       login.js \
+       redirection.js \
+       parseuri.js \
        screen.js \
+       search.js \
+       systemConfig.js \
+       uri.js \
        $(NULL)
 
 COMPRESS = java -jar $(COMPRESSOR) --type js --charset UTF-8
@@ -16,8 +24,8 @@ build: ../Rakka/Resource/JavaScript.hs
 
 
 packed.js: $(SOURCES) $(COMPRESSOR)
-#      cat $(SOURCES) > $@
-       cat $(SOURCES) | $(COMPRESS) --warn -o $@
+       cat $(SOURCES) > $@
+#      cat $(SOURCES) | $(COMPRESS) -o $@
 
 
 ../Rakka/Resource/JavaScript.hs: packed.js
@@ -28,7 +36,7 @@ clean:
        rm -f ../Rakka/Resource/JavaScript.hs packed.js $(JQUERY_PACKED)
 
 
-yuicompressor.jar:
-       @echo "Error: yuicompressor.jar has to be placed on this directory."
+$(COMPRESSOR):
+       @echo "Error: $(COMPRESSOR) has to be placed on this directory."
        @echo "       See http://www.julienlecomte.net/yuicompressor/"
        @exit 1