X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile;h=ec974daf5d3de2e20ca4a1b88d677ed42ec1d14b;hb=99e4d5138a0f9911297ae4a88d1be940441115ab;hp=d2e8823fc4c571268dc944bdd50b183211489dd4;hpb=d6931adf12355c9d0cccde8cbc3d8ee92fc9100e;p=chaz%2Fvimcoder

diff --git a/Makefile b/Makefile
index d2e8823..ec974da 100644
--- 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.4
 
-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