use jar(1) instead of zip(1) to create the jar file

[chaz/vimcoder] / Makefile

diff --git a/Makefile b/Makefile
index d2e8823fc4c571268dc944bdd50b183211489dd4..325ca321b7551fbe0ea92a47db16f9d5afc7dbb3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,24 @@
 
-# Use this file with ``make'' to compile and package VimCoder.
+# Use this file with GNU make to compile and package VimCoder.
 # Supported targets: all clean distclean dist fetch jar
 
 project                = VimCoder
-version                = 0.3.1
+version                = 0.3.3
 
-sources                = src/com/dogcows/VimCoder.java src/com/dogcows/Util.java src/com/dogcows/Editor.java
+sources                = $(wildcard src/com/dogcows/*.java)
 library                = lib/ContestApplet.jar
 jarfile                = $(project)-$(version).jar
+resources      = $(wildcard src/com/dogcows/resources/*)
 
 JAVAC          = javac
 JAVACFLAGS     = -d . -sourcepath src -classpath $(library)
 
 
 classes                = $(sources:src/%.java=%.class)
-all: $(classes)
+all: $(firstword $(classes))
 
 clean:
-       rm -rf META-INF com
+       rm -rf com
 
 distclean: clean
        rm -rf lib
@@ -30,26 +31,22 @@ fetch: $(library)
 jar: $(jarfile)
 
 
+$(classes): $(sources) $(library)
+       $(JAVAC) $(JAVACFLAGS) $<
+
 $(library):
        @echo "Fetching dependencies..."
        mkdir -p lib
        curl -o $@ http://www.topcoder.com/contest/classes/ContestApplet.jar
 
-$(jarfile): $(classes) META-INF/MANIFEST.MF
+$(jarfile): $(classes) $(resources)
        @echo "Packaging jar file..."
        mkdir -p com/dogcows/resources
        cp src/com/dogcows/resources/* com/dogcows/resources
        rm -f $@
-       zip $@ META-INF/MANIFEST.MF COPYING README $$(find com -type f | sort)
+       jar cvf $@ COPYING README.md com
        @echo "Done."
 
-$(classes): $(sources) $(library)
-       $(JAVAC) $(JAVACFLAGS) $<
-
-META-INF/MANIFEST.MF:
-       mkdir -p META-INF
-       printf "Manifest-Version: 1.0\n\n" >$@
-
 
 .PHONY: all clean distclean dist fetch jar