diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:43:08 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:43:08 -0700 |
| commit | 12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237 (patch) | |
| tree | 82b9820ae26decd6ac41bd8a06185d978980ee3c /src/Makefile.am | |
| parent | cf14183bcd5485b4a71541599ddce0b35eb71352 (diff) | |
| parent | b53417c7356deab70f44b60bd7e6270023ddc3b6 (diff) | |
| download | protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.tar.gz protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.tar.bz2 protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.zip | |
Merge branch 'master' of github.com:google/protobuf
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 \ |