From 40280662db28199779854b1806d230ab3385c755 Mon Sep 17 00:00:00 2001
From: Allan Clark <allanc@chickenandporn.com>
Date: Wed, 28 May 2014 03:22:38 -0700
Subject: [PATCH 1/2] working through build issues

---
 Makefile.am   | 23 +++++++++++++++++++++++
 zip/Keep.java |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 Makefile.am

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000000000..88ddf5a5a
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,23 @@
+nodist_java_JAVA = CDL.java Cookie.java CookieList.java HTTP.java HTTPTokener.java JSONArray.java JSONException.java JSONML.java JSONObject.java JSONString.java JSONStringer.java JSONTokener.java JSONWriter.java Kim.java Property.java XML.java XMLTokener.java
+nodist_java_JAVA += zip/BitInputStream.java zip/BitOutputStream.java zip/BitReader.java zip/BitWriter.java zip/Huff.java zip/JSONzip.java zip/Keep.java zip/MapKeep.java zip/None.java zip/PostMortem.java zip/TrieKeep.java zip/Unzipper.java zip/Zipper.java
+nodist_java_DATA = $(subdir).jar
+javadir = $(pkgdir)
+
+EXTRA_DIST = $(nodist_java_JAVA)
+CONFIG_CLEAN_FILES = $(subdir).jar
+
+JAVAROOT = bld
+BUILT_SOURCES = javaroot.stamp
+
+javaroot.stamp: $(nodist_java_JAVA)
+	mkdir -p $(JAVAROOT) && touch $@
+
+AM_JAVACFLAGS= @JAVAC_FLAGS@ -cp $(JAVAROOT)
+
+$(subdir).jar: classjava.stamp
+	awk -v BUILDTOP="bld" '/^package / {gsub (";$$",""); gsub ("\\.","/",$$2); SUBS[$$2]=$$2 } END { FIRST=0; for (n in SUBS) { if (0 == FIRST++) printf "jar cvf $@"; printf " -C %s %s",BUILDTOP,n }; printf "\n"; }' $(nodist_java_JAVA) | $(SHELL)
+	touch $(notdir $(subdir)).class
+
+clean-local:
+	CLASSES=`for i in $(nodist_java_JAVA); do awk -v FILE="$$i" '/^package / {gsub (";$$",""); gsub (".java",".class",FILE); gsub ("\\\\.","/",$$2); printf "%s/%s\n",$$2,FILE}' $(srcdir)/$$i; done`; (cd $(top_builddir)/ && rm -f $$CLASSES)
+	
diff --git a/zip/Keep.java b/zip/Keep.java
index bc647b6a0..395928d13 100644
--- a/zip/Keep.java
+++ b/zip/Keep.java
@@ -36,12 +36,14 @@ of this software and associated documentation files (the "Software"), to deal
  * @version 2013-05-03
  */
 class Keep implements None, PostMortem {
-    private int capacity;
+    protected int capacity;
+    //public int capacity() { return capacity; }
     protected int length;
     private Object[] list;
     private HashMap<Object, Integer> map;
     private int power;
     private long[] ticks;
+    public long[] uses() { return ticks; };
 
     public Keep(int bits) {
         this.capacity = 1 << bits;

From be84569fade57927fa4f3b59b3a27e8fd21cebf7 Mon Sep 17 00:00:00 2001
From: Allan Clark <allanc@chickenandporn.com>
Date: Wed, 28 May 2014 03:24:49 -0700
Subject: [PATCH 2/2] working through build issues

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..dcce6e956
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+bld
+javaroot.stamp