THRIFT-289. test: "make check" no longer runs the Java tests

Thanks to David for the changes that straighten the makefiles out.



git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@739024 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/Makefile.am b/test/Makefile.am
index dab0f4e..0c201c1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,9 +1,5 @@
 SUBDIRS =
 
-if WITH_JAVA
-SUBDIRS += java
-endif
-
 if WITH_PYTHON
 SUBDIRS += py
 endif
@@ -23,7 +19,8 @@
 	gen-cpp/SecondService.cpp \
 	gen-cpp/ThriftTest_constants.cpp \
 	gen-cpp/ThriftTest.cpp \
-	gen-cpp/ThriftTest_types.cpp
+	gen-cpp/ThriftTest_types.cpp \
+	ThriftTest_extras.cpp
 
 libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la