aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2015-02-17 18:23:41 -0800
committerJosh Haberman <jhaberman@gmail.com>2015-02-17 18:23:41 -0800
commitcb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9 (patch)
treee7e5dd284e2384dfaf1f8eff0eb2f3feab944872 /src/Makefile.am
parentf473bb9903370cc9324b0881873e0d0861f5d325 (diff)
downloadprotobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.gz
protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.bz2
protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.zip
Integrate changes from Google open-source branch.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 46190713..e1a2e169 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,6 +106,7 @@ nobase_include_HEADERS = \
google/protobuf/compiler/plugin.pb.h \
google/protobuf/compiler/cpp/cpp_generator.h \
google/protobuf/compiler/java/java_generator.h \
+ google/protobuf/compiler/java/java_names.h \
google/protobuf/compiler/python/python_generator.h
lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la