diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-10-11 14:44:03 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-10-11 14:44:03 -0700 |
| commit | de15e73d5862e8ac618bc7be90594adacbaa1ec6 (patch) | |
| tree | 9d1f71f76902010963e0dc28db266de22b82646d /src/Makefile.am | |
| parent | c4083bb3d1231f8a94f2f000434e38528bdff64a (diff) | |
| parent | bd798dfc81443cb95ff3b6e0b787c92031b113e5 (diff) | |
Merge remote-tracking branch 'origin/3.4.x' into master
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2bc65664..b035fbd2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -564,8 +564,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_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 \ @@ -586,6 +586,12 @@ EXTRA_DIST = \ $(protoc_inputs) \ $(js_well_known_types_sources) \ solaris/libstdc++.la \ + google/protobuf/unittest_proto3.proto \ + google/protobuf/unittest_import_public_proto3.proto \ + google/protobuf/unittest_import_proto3.proto \ + google/protobuf/test_messages_proto3.proto \ + google/protobuf/test_messages_proto2.proto \ + google/protobuf/map_unittest_proto3.proto \ google/protobuf/io/gzip_stream.h \ google/protobuf/io/gzip_stream_unittest.sh \ google/protobuf/testdata/golden_message \ |