X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile;h=c662f826e7e65b7c39a148fe6694dbc2bc962ee2;hb=0f3861847fb53a0b64c08ad1f4c8d9893f072527;hp=ea84d09e0eb28f7c3a9994f793096debd08e1f61;hpb=7db10c9f0c1c4b358ad1a161a41ea1354a5bcecb;p=chaz%2Fvimcoder

diff --git a/Makefile b/Makefile
index ea84d09..c662f82 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,9 @@
 # Supported targets: all clean distclean dist fetch jar
 
 project		= VimCoder
-version		= 0.3.1
+version		= 0.3.2
 
-mainclass	= src/com/dogcows/VimCoder.java
+sources		= src/com/dogcows/VimCoder.java src/com/dogcows/Util.java src/com/dogcows/Editor.java
 library		= lib/ContestApplet.jar
 jarfile		= $(project)-$(version).jar
 
@@ -13,7 +13,8 @@ JAVAC		= javac
 JAVACFLAGS	= -d . -sourcepath src -classpath $(library)
 
 
-all: $(classobj)
+classes		= $(sources:src/%.java=%.class)
+all: $(firstword $(classes))
 
 clean:
 	rm -rf META-INF com
@@ -29,15 +30,12 @@ fetch: $(library)
 jar: $(jarfile)
 
 
-classobj	= $(mainclass:src/%.java=%.class)
-
-
 $(library):
 	@echo "Fetching dependencies..."
 	mkdir -p lib
 	curl -o $@ http://www.topcoder.com/contest/classes/ContestApplet.jar
 
-$(jarfile): $(classobj) META-INF/MANIFEST.MF
+$(jarfile): $(firstword $(classes)) META-INF/MANIFEST.MF
 	@echo "Packaging jar file..."
 	mkdir -p com/dogcows/resources
 	cp src/com/dogcows/resources/* com/dogcows/resources
@@ -45,7 +43,7 @@ $(jarfile): $(classobj) META-INF/MANIFEST.MF
 	zip $@ META-INF/MANIFEST.MF COPYING README $$(find com -type f | sort)
 	@echo "Done."
 
-$(classobj): $(mainclass)
+$(classes): $(sources) $(library)
 	$(JAVAC) $(JAVACFLAGS) $<
 
 META-INF/MANIFEST.MF:
@@ -53,8 +51,5 @@ META-INF/MANIFEST.MF:
 	printf "Manifest-Version: 1.0\n\n" >$@
 
 
-$(mainclass): src/com/dogcows/Util.java src/com/dogcows/Editor.java
-$(classobj): $(library)
-
 .PHONY: all clean distclean dist fetch jar