improve ability to run vimcoder in-place (i.e. jar-less)

diff --git a/Makefile b/Makefile
index 3d226322230d4d8c85d943c37f8344172dd47929..18f8c17a5f5ad32db56b49ba4f813a0e29eaf36b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,17 @@ project               = VimCoder
 version                = 0.3.4
 
 sources                = $(wildcard src/com/dogcows/*.java)
 version                = 0.3.4
 
 sources                = $(wildcard src/com/dogcows/*.java)

+classes                = $(sources:src/%.java=%.class)

 library                = lib/ContestApplet.jar
 jarfile                = $(project)-$(version).jar
 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)
 
 
 
 JAVAC          = javac
 JAVACFLAGS     = -d . -sourcepath src -classpath $(library)
 
 

-classes                = $(sources:src/%.java=%.class)
-all: $(firstword $(classes))
+all: $(classes) $(resources:src/%=%)

 
 clean:
        rm -rf com
 
 clean:
        rm -rf com


@@ -31,21 +32,23 @@ fetch: $(library)
 jar: $(jarfile)
 
 
 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):
 
 $(library):

-       @echo "Fetching dependencies..."

        mkdir -p lib
        curl -o $@ http://www.topcoder.com/contest/classes/ContestApplet.jar
 
        mkdir -p lib
        curl -o $@ http://www.topcoder.com/contest/classes/ContestApplet.jar
 

-$(jarfile): $(classes) $(resources)
-       @echo "Packaging jar file..."
-       mkdir -p com/dogcows/resources
-       cp src/com/dogcows/resources/* com/dogcows/resources
+$(jarfile): all

        rm -f $@
        jar cvf $@ COPYING README.md com
        rm -f $@
        jar cvf $@ COPYING README.md com

-       @echo "Done."

 
 
 .PHONY: all clean distclean dist fetch jar
 
 
 .PHONY: all clean distclean dist fetch jar