diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 1c47657..2c67255 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -9,7 +9,6 @@
                  src/main.cc \
                  src/md5c.c \
                  src/generate/t_generator.cc \
-                 src/generate/t_java_generator.cc \
                  src/generate/t_php_generator.cc \
                  src/generate/t_py_generator.cc \
                  src/generate/t_rb_generator.cc \
@@ -60,6 +59,9 @@
 if THRIFT_GEN_cpp
 thrift_SOURCES += src/generate/t_cpp_generator.cc
 endif
+if THRIFT_GEN_java
+thrift_SOURCES += src/generate/t_java_generator.cc
+endif
 
 thrift_CXXFLAGS = -Wall -I$(srcdir)/src $(BOOST_CPPFLAGS)
 thrift_LDFLAGS = -Wall $(BOOST_LDFLAGS)