X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=js%2FMakefile;h=1fc9cee3461e560a11349f7a54a1c2e96433a2e5;hb=9c2fc861f3ed609ebb4d0f135aea38ca055bbea8;hp=a399e6f2fe63a2ecaf33292c430a0cd71c8b516b;hpb=d128bc12ae9f763c37941122bf2e163517810bba;p=Rakka.git

diff --git a/js/Makefile b/js/Makefile
index a399e6f..1fc9cee 100644
--- 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) \
@@ -7,9 +7,15 @@ SOURCES = \
 	base.js \
 	base64.js \
 	editPage.js \
+	hexDump.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
@@ -19,8 +25,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
@@ -31,7 +37,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