diff options
author | Feng Xiao <xiaofeng@google.com> | 2016-04-20 17:15:16 -0700 |
---|---|---|
committer | Feng Xiao <xiaofeng@google.com> | 2016-04-20 17:15:16 -0700 |
commit | 0ad204845fd5f18f1362918d6952ac2126c96b67 (patch) | |
tree | 65495ae0eeab4df008a1f034003a82a05f87c374 /src/Makefile.am | |
parent | f00300d7f04f1c38a7d70e271f9232b94dd0e326 (diff) | |
parent | baf52bd79e80b019370a1bfda70e46ff6a692e2b (diff) | |
download | protobuf-0ad204845fd5f18f1362918d6952ac2126c96b67.tar.gz protobuf-0ad204845fd5f18f1362918d6952ac2126c96b67.tar.bz2 protobuf-0ad204845fd5f18f1362918d6952ac2126c96b67.zip |
Merge pull request #1416 from cwhipkey/master
Change protobuf CPP proto generator to support the 'lite' option in
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2ba0ef9b..80065506 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -507,6 +507,8 @@ protoc_inputs = \ google/protobuf/unittest_preserve_unknown_enum.proto \ google/protobuf/unittest.proto \ google/protobuf/unittest_proto3_arena.proto \ + google/protobuf/unittest_proto3_arena_lite.proto \ + google/protobuf/unittest_proto3_lite.proto \ google/protobuf/unittest_well_known_types.proto \ google/protobuf/util/internal/testdata/anys.proto \ google/protobuf/util/internal/testdata/books.proto \ @@ -609,6 +611,10 @@ protoc_outputs = \ google/protobuf/unittest_preserve_unknown_enum.pb.h \ google/protobuf/unittest_proto3_arena.pb.cc \ google/protobuf/unittest_proto3_arena.pb.h \ + google/protobuf/unittest_proto3_arena_lite.pb.cc \ + google/protobuf/unittest_proto3_arena_lite.pb.h \ + google/protobuf/unittest_proto3_lite.pb.cc \ + google/protobuf/unittest_proto3_lite.pb.h \ google/protobuf/unittest_well_known_types.pb.cc \ google/protobuf/unittest_well_known_types.pb.h \ google/protobuf/util/internal/testdata/anys.pb.cc \ @@ -710,6 +716,8 @@ protobuf_test_SOURCES = \ google/protobuf/no_field_presence_test.cc \ google/protobuf/preserve_unknown_enum_test.cc \ google/protobuf/proto3_arena_unittest.cc \ + google/protobuf/proto3_arena_lite_unittest.cc \ + google/protobuf/proto3_lite_unittest.cc \ google/protobuf/reflection_ops_unittest.cc \ google/protobuf/repeated_field_reflection_unittest.cc \ google/protobuf/repeated_field_unittest.cc \ |