X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fvimcoder;a=blobdiff_plain;f=Makefile;h=18f8c17a5f5ad32db56b49ba4f813a0e29eaf36b;hp=cb127255a780c50ab06e353eeb2973fdb4541563;hb=1a39937d5e2c04f3fa8166c65289afae165b3ea6;hpb=fabb7e8d373d2ea2bc6b65b117c9cb0a0a03c114

diff --git a/Makefile b/Makefile
index cb12725..18f8c17 100644
--- a/Makefile
+++ b/Makefile
@@ -3,22 +3,23 @@
 # Supported targets: all clean distclean dist fetch jar
 
 project		= VimCoder
-version		= 0.3.2
+version		= 0.3.4
 
 sources		= $(wildcard src/com/dogcows/*.java)
+classes		= $(sources:src/%.java=%.class)
 library		= lib/ContestApplet.jar
 jarfile		= $(project)-$(version).jar
-resources	= $(wildcard src/com/dogcows/resources/*)
+resource_path	= com/dogcows/resources
+resources	= $(wildcard src/$(resource_path)/*)
 
 JAVAC		= javac
 JAVACFLAGS	= -d . -sourcepath src -classpath $(library)
 
 
-classes		= $(sources:src/%.java=%.class)
-all: $(firstword $(classes))
+all: $(classes) $(resources:src/%=%)
 
 clean:
-	rm -rf META-INF com
+	rm -rf com
 
 distclean: clean
 	rm -rf lib
@@ -31,27 +32,25 @@ fetch: $(library)
 jar: $(jarfile)
 
 
-$(classes): $(sources) $(library)
-	$(JAVAC) $(JAVACFLAGS) $<
+$(classes): $(sources) | $(library)
+	$(JAVAC) $(JAVACFLAGS) $^
+
+$(resource_path):
+	mkdir -p "$@"
+
+$(resource_path)/%: src/$(resource_path)/% | $(resource_path)
+	cp "$<" "$@"
+
 
 $(library):
-	@echo "Fetching dependencies..."
 	mkdir -p lib
 	curl -o $@ http://www.topcoder.com/contest/classes/ContestApplet.jar
 
-$(jarfile): $(classes) $(resources) META-INF/MANIFEST.MF
-	@echo "Packaging jar file..."
-	mkdir -p com/dogcows/resources
-	cp src/com/dogcows/resources/* com/dogcows/resources
+$(jarfile): all
 	rm -f $@
-	zip $@ META-INF/MANIFEST.MF COPYING README $$(find com -type f | sort)
-	@echo "Done."
-
-META-INF/MANIFEST.MF:
-	@echo "Generating MANIFEST.MF..."
-	mkdir -p META-INF
-	printf "Manifest-Version: 1.0\n\n" >$@
+	jar cvf $@ COPYING README.md com
 
 
 .PHONY: all clean distclean dist fetch jar
 
+# vim:noet:ts=8