# HG changeset patch # User xitiomet # Date 1260478053 18000 # Node ID 70bda0e79242791eeb3cac5b1accf8b5c9f22e5e # Parent a6a387395e58fc5fab19714c774af7975bdb1a1f updated makefile diff -r a6a387395e58fc5fab19714c774af7975bdb1a1f -r 70bda0e79242791eeb3cac5b1accf8b5c9f22e5e Makefile --- a/Makefile Wed Dec 02 17:54:34 2009 -0500 +++ b/Makefile Thu Dec 10 15:47:33 2009 -0500 @@ -4,15 +4,14 @@ JAR=jar JC_FLAGS=-d build -all: json-gcj.jar -jvm: json.jar +all: json.jar -json.jar: +jvm: mkdir jvm-build javac -cp jvm-build:src -d jvm-build src/org/json/*.java - $(JAR) -cvf $@ -C jvm-build org + $(JAR) -cvf json.jar -C jvm-build org -json-gcj.jar: build/org/json/JSONArray.class build/org/json/JSONException.class build/org/json/JSONObject.class build/org/json/JSONString.class build/org/json/JSONStringer.class build/org/json/JSONTokener.class build/org/json/JSONWriter.class +json.jar: build/org/json/JSONArray.class build/org/json/JSONException.class build/org/json/JSONObject.class build/org/json/JSONString.class build/org/json/JSONStringer.class build/org/json/JSONTokener.class build/org/json/JSONWriter.class $(JAR) -cvf $@ -C build org build/org/json/JSONArray.class: src/org/json/JSONArray.java build/org/json/JSONObject.class @@ -39,5 +38,4 @@ clean: rm -R -f build/ rm -R -f jvm-build/ - rm -f json-gcj.jar rm -f json.jar