Makefile: include Java test suite artifacts

Automake has problems handling the naming convention used by Java for
inner classes (x$y.class).

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 1cfb5a76f6d6fbfda02a0e03db32b113172c399f..f64129f1c3dccdaf106601a6c7dc6bae23e83366 100644 (file)
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -53,6 +53,7 @@ BUILT_SOURCES = $(JAVA_H)
 if WITH_DEBUG 
 
 JAVA_TEST_CLASSES = $(JAVA_TEST_SRC:test/%.java=%.class)
+ESCAPED_JAVA_TEST_CLASSES = com/ceph/fs/CephAllTests\$$1.class
 
 CEPH_TEST_PROXY=test/com/ceph/fs/CephMountTest.class
 
@@ -61,7 +62,7 @@ $(CEPH_TEST_PROXY): $(JAVA_TEST_SRC) $(CEPH_PROXY)
        $(JAVAC) -source 1.5 -target 1.5 test/com/ceph/fs/*.java
 
 libcephfs-test.jar: $(CEPH_TEST_PROXY)
-       $(JAR) cf $@ $(JAVA_TEST_CLASSES:%=-C test %) 
+       $(JAR) cf $@ $(JAVA_TEST_CLASSES:%=-C test %) $(ESCAPED_JAVA_TEST_CLASSES:%=-C test %)
 
 java_DATA += libcephfs-test.jar