diff Makefile @ 18:4507a431b410

More work.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 31 Jan 2011 16:05:36 +0200
parents 59ff451750fb
children df494a65bf8c
line wrap: on
line diff
--- a/Makefile	Mon Jan 31 08:13:11 2011 +0200
+++ b/Makefile	Mon Jan 31 16:05:36 2011 +0200
@@ -3,7 +3,7 @@
 
 RESOURCES=graphics/board.png
 
-CLASSES=game/Piece.class game/PieceType.class game/Engine.class game/Interpolate.class
+CLASSES=game/Piece.java game/PieceType.java game/Engine.java game/Interpolate.java game/ResourceLoader.java
 
 # Utils
 JAVAC=javac -g
@@ -12,20 +12,14 @@
 ###
 ### Targets
 ###
-TARGETS=$(RUN) $(CLASSES)
+TARGETS=$(RUN)
 
 all: $(TARGETS)
 
 
-%.class: %.java
+Ristipolku.class: Ristipolku.java $(CLASSES)
 	$(JAVAC) $<
 
-game/%.class: game/%.java
-	$(JAVAC) $<
-
-
-Ristipolku.class: game/Piece.class game/PieceType.class game/Engine.class game/Interpolate.class
-
 
 run: $(RUN)
 	$(APPLETVIEWER) $(patsubst %.class,%.html,$<)
@@ -35,12 +29,12 @@
 ### Package
 ###
 Ristipolku.jar: $(RUN) $(CLASSES) $(RESOURCES)
-	jar cvf $@ $+
+	jar cvfm $@ manifest.txt $(RUN) game/*.class $(RESOURCES)
 
 
 upload: Ristipolku.jar
 	@scp $+ ccr@tnsp.org:public_html/ristipolku/
-#	$(RM) $<
+	$(RM) $<
 
 
 ###