diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:25:20 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:25:20 -0800 |
| commit | 55cf8abecbafc2b47c8060df88cc103859c67138 (patch) | |
| tree | 1cc1c4303bc868f14870f29d0a4d2c594cd1cca8 /src/Makefile.am | |
| parent | cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9 (diff) | |
| parent | 2cb2358cba7eb296d6243912758b9e9c78d1502e (diff) | |
| download | protobuf-55cf8abecbafc2b47c8060df88cc103859c67138.tar.gz protobuf-55cf8abecbafc2b47c8060df88cc103859c67138.tar.bz2 protobuf-55cf8abecbafc2b47c8060df88cc103859c67138.zip | |
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e1a2e169..0f0bd089 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -107,7 +107,9 @@ nobase_include_HEADERS = \ 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 + google/protobuf/compiler/javanano/javanano_generator.h \ + google/protobuf/compiler/python/python_generator.h \ + google/protobuf/compiler/ruby/ruby_generator.h lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la @@ -241,26 +243,28 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/java/java_doc_comment.cc \ google/protobuf/compiler/java/java_doc_comment.h \ google/protobuf/compiler/javanano/javanano_enum.cc \ + google/protobuf/compiler/javanano/javanano_enum.h \ + google/protobuf/compiler/javanano/javanano_enum_field.cc \ google/protobuf/compiler/javanano/javanano_enum_field.h \ google/protobuf/compiler/javanano/javanano_extension.cc \ + google/protobuf/compiler/javanano/javanano_extension.h \ google/protobuf/compiler/javanano/javanano_field.cc \ + google/protobuf/compiler/javanano/javanano_field.h \ google/protobuf/compiler/javanano/javanano_file.cc \ + google/protobuf/compiler/javanano/javanano_file.h \ google/protobuf/compiler/javanano/javanano_generator.cc \ + google/protobuf/compiler/javanano/javanano_generator.h \ google/protobuf/compiler/javanano/javanano_helpers.cc \ + google/protobuf/compiler/javanano/javanano_helpers.h \ + google/protobuf/compiler/javanano/javanano_map_field.cc \ + google/protobuf/compiler/javanano/javanano_map_field.h \ google/protobuf/compiler/javanano/javanano_message.cc \ + google/protobuf/compiler/javanano/javanano_message.h \ + google/protobuf/compiler/javanano/javanano_message_field.cc \ google/protobuf/compiler/javanano/javanano_message_field.h \ google/protobuf/compiler/javanano/javanano_params.h \ - google/protobuf/compiler/javanano/javanano_primitive_field.h \ - google/protobuf/compiler/javanano/javanano_enum_field.cc \ - google/protobuf/compiler/javanano/javanano_enum.h \ - google/protobuf/compiler/javanano/javanano_extension.h \ - google/protobuf/compiler/javanano/javanano_field.h \ - google/protobuf/compiler/javanano/javanano_file.h \ - google/protobuf/compiler/javanano/javanano_generator.h \ - google/protobuf/compiler/javanano/javanano_helpers.h \ - google/protobuf/compiler/javanano/javanano_message_field.cc \ - google/protobuf/compiler/javanano/javanano_message.h \ google/protobuf/compiler/javanano/javanano_primitive_field.cc \ + google/protobuf/compiler/javanano/javanano_primitive_field.h \ google/protobuf/compiler/python/python_generator.cc \ google/protobuf/compiler/ruby/ruby_generator.cc @@ -456,6 +460,7 @@ protobuf_test_SOURCES = \ google/protobuf/compiler/java/java_plugin_unittest.cc \ google/protobuf/compiler/java/java_doc_comment_unittest.cc \ google/protobuf/compiler/python/python_plugin_unittest.cc \ + google/protobuf/compiler/ruby/ruby_generator_unittest.cc \ $(COMMON_TEST_SOURCES) nodist_protobuf_test_SOURCES = $(protoc_outputs) |