jQuery 1.2.2 -> 1.2.6

[Rakka.git] / js / Makefile

diff --git a/js/Makefile b/js/Makefile
index 63477dd7bab4bae8ac88cde27c5a886f1b06a6ff..ccd88fb2accf85687721a821afe2c5df0019163c 100644 (file)
--- a/js/Makefile
+++ b/js/Makefile
@@ -1,5 +1,5 @@
-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) \
@@ -10,7 +10,11 @@ SOURCES = \
        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
@@ -21,7 +25,7 @@ build: ../Rakka/Resource/JavaScript.hs
 
 packed.js: $(SOURCES) $(COMPRESSOR)
        cat $(SOURCES) > $@
-#      cat $(SOURCES) | $(COMPRESS) --warn -o $@
+#      cat $(SOURCES) | $(COMPRESS) -o $@
 
 
 ../Rakka/Resource/JavaScript.hs: packed.js
@@ -32,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