From ce08d3bf86f4705057e291048ed0db8bf8198d8c Mon Sep 17 00:00:00 2001
From: foo <foo@mafoo.org.uk>
Date: Mon, 15 Feb 2016 20:40:25 +0000
Subject: [PATCH] move main.class compilation and building

---
 Makefile | 5 ++---
 mkwar.sh | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5c09287..21cc9a4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@ JAVA  = /usr/bin/java
 JAVAC = /usr/bin/javac
 JFLAGS = -g # -classpath $(LIBS)
 
-SRCS = main.java \
-	uk/org/mafoo/wordbubbles/Cell.java \
+SRCS = uk/org/mafoo/wordbubbles/Cell.java \
 	uk/org/mafoo/wordbubbles/ImpossibleException.java \
 	uk/org/mafoo/wordbubbles/Lexicon.java \
 	uk/org/mafoo/wordbubbles/Prison.java
@@ -21,7 +20,7 @@ run: all
 .java.class:
 	$(JAVAC) $(JFLAGS) $<
 
-build: $(OBJS)
+build: $(OBJS) main.class
 
 clean:
 	rm -f $(OBJS)
diff --git a/mkwar.sh b/mkwar.sh
index 4d67e3b..207f8e9 100755
--- a/mkwar.sh
+++ b/mkwar.sh
@@ -6,4 +6,4 @@ mkdir -p war/WEB-INF/lib war/WEB-INF/classes
 cp wordbubbles.jar war/WEB-INF/lib
 # cp -r uk war/WEB-INF/classes
 cd war
-zip -r ../wordbubbles.war *.jsp WEB-INF
+zip -r ../wordbubbles.war *.jsp WEB-INF words