fix makefile

This commit is contained in:
Matthew Slowe 2020-04-05 13:25:37 +01:00
parent 87577944fb
commit ce1e7a2fe5

View File

@ -9,7 +9,7 @@ SRCS = uk/org/mafoo/wordsearch/CouldNotPlaceWordException.java \
uk/org/mafoo/wordsearch/DistributedRandomNumberGenerator.java \ uk/org/mafoo/wordsearch/DistributedRandomNumberGenerator.java \
uk/org/mafoo/wordsearch/Direction.java uk/org/mafoo/wordsearch/Direction.java
JSPS = $(wildcard war/*.jsp war/*.css) JSPS = $(wildcard war/*.jsp war/*.css war/WEB-INF/jspf/*.jspf)
OBJS = ${SRCS:.java=.class} OBJS = ${SRCS:.java=.class}
@ -27,6 +27,8 @@ clean:
wordsearch.jar: $(OBJS) wordsearch.jar: $(OBJS)
jar cf $@ $(OBJS) jar cf $@ $(OBJS)
wordsearch.war: wordsearch.jar war/WEB-INF/lib/wordsearch.jar: wordsearch.jar
cp -f wordsearch.jar war/lib cp $< $@
jar -c -f $@ -C war .
wordsearch.war: war/WEB-INF/lib/wordsearch.jar $(JSPS)
jar -cvf $@ -C war .