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 /Makefile.am | |
| parent | c4083bb3d1231f8a94f2f000434e38528bdff64a (diff) | |
| parent | bd798dfc81443cb95ff3b6e0b787c92031b113e5 (diff) | |
| download | protobuf-de15e73d5862e8ac618bc7be90594adacbaa1ec6.tar.gz protobuf-de15e73d5862e8ac618bc7be90594adacbaa1ec6.tar.bz2 protobuf-de15e73d5862e8ac618bc7be90594adacbaa1ec6.zip | |
Merge remote-tracking branch 'origin/3.4.x' into master
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 3222ec6f..44c6269e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -650,6 +650,9 @@ php_EXTRA_DIST= \ php/src/Google/Protobuf/Internal/EnumOptions.php \ php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php \ php/src/Google/Protobuf/Internal/EnumValueOptions.php \ + php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php \ + php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php \ + php/src/Google/Protobuf/Internal/FieldDescriptorProto.php \ php/src/Google/Protobuf/Internal/FieldDescriptor.php \ php/src/Google/Protobuf/Internal/FieldDescriptorProto.php \ php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php \ @@ -732,6 +735,12 @@ php_EXTRA_DIST= \ php/tests/proto/test_no_namespace.proto \ php/tests/proto/test_php_namespace.proto \ php/tests/proto/test_prefix.proto \ + php/tests/proto/test_reserved_enum_lower.proto \ + php/tests/proto/test_reserved_enum_upper.proto \ + php/tests/proto/test_reserved_enum_value_lower.proto \ + php/tests/proto/test_reserved_enum_value_upper.proto \ + php/tests/proto/test_reserved_message_lower.proto \ + php/tests/proto/test_reserved_message_upper.proto \ php/tests/proto/test_service.proto \ php/tests/proto/test_service_namespace.proto \ php/tests/test.sh \ @@ -1025,8 +1034,10 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ cmake/libprotoc.cmake \ cmake/protobuf-config-version.cmake.in \ cmake/protobuf-config.cmake.in \ + cmake/protobuf-lite.pc.cmake \ cmake/protobuf-module.cmake.in \ cmake/protobuf-options.cmake \ + cmake/protobuf.pc.cmake \ cmake/protoc.cmake \ cmake/tests.cmake \ editors/README.txt \ |