diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-11 17:09:20 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-11 17:10:28 -0800 |
| commit | e841bac4fcf47f809e089a70d5f84ac37b3883df (patch) | |
| tree | d25dc5fc814db182c04c5f276ff1a609c5965a5a /Makefile.am | |
| parent | 99a6a95c751a28a3cc33dd2384959179f83f682c (diff) | |
| download | protobuf-e841bac4fcf47f809e089a70d5f84ac37b3883df.tar.gz protobuf-e841bac4fcf47f809e089a70d5f84ac37b3883df.tar.bz2 protobuf-e841bac4fcf47f809e089a70d5f84ac37b3883df.zip | |
Down-integrate from internal code base.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index bb735177..6ebe3639 100644 --- a/Makefile.am +++ b/Makefile.am @@ -215,6 +215,7 @@ java_EXTRA_DIST= \ java/src/main/java/com/google/protobuf/Message.java \ java/src/main/java/com/google/protobuf/MessageLite.java \ java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java \ + java/src/main/java/com/google/protobuf/MessageLiteToString.java \ java/src/main/java/com/google/protobuf/MessageOrBuilder.java \ java/src/main/java/com/google/protobuf/MessageReflection.java \ java/src/main/java/com/google/protobuf/MutabilityOracle.java \ @@ -233,6 +234,7 @@ java_EXTRA_DIST= \ java/src/main/java/com/google/protobuf/SingleFieldBuilder.java \ java/src/main/java/com/google/protobuf/SmallSortedMap.java \ java/src/main/java/com/google/protobuf/TextFormat.java \ + java/src/main/java/com/google/protobuf/TextFormatEscaper.java \ java/src/main/java/com/google/protobuf/UninitializedMessageException.java \ java/src/main/java/com/google/protobuf/UnknownFieldSet.java \ java/src/main/java/com/google/protobuf/UnknownFieldSetLite.java \ @@ -504,6 +506,7 @@ objectivec_EXTRA_DIST= \ python_EXTRA_DIST= \ python/MANIFEST.in \ + python/google/protobuf/internal/any_test.proto \ python/google/protobuf/internal/api_implementation.cc \ python/google/protobuf/internal/api_implementation.py \ python/google/protobuf/internal/containers.py \ @@ -540,6 +543,8 @@ python_EXTRA_DIST= \ python/google/protobuf/internal/text_format_test.py \ python/google/protobuf/internal/type_checkers.py \ python/google/protobuf/internal/unknown_fields_test.py \ + python/google/protobuf/internal/well_known_types.py \ + python/google/protobuf/internal/well_known_types_test.py \ python/google/protobuf/internal/wire_format.py \ python/google/protobuf/internal/wire_format_test.py \ python/google/protobuf/internal/__init__.py \ @@ -558,8 +563,6 @@ python_EXTRA_DIST= \ python/google/protobuf/pyext/extension_dict.cc \ python/google/protobuf/pyext/message.h \ python/google/protobuf/pyext/message.cc \ - python/google/protobuf/pyext/message_map_container.cc \ - python/google/protobuf/pyext/message_map_container.h \ python/google/protobuf/pyext/proto2_api_test.proto \ python/google/protobuf/pyext/python.proto \ python/google/protobuf/pyext/python_protobuf.h \ @@ -567,8 +570,6 @@ python_EXTRA_DIST= \ python/google/protobuf/pyext/repeated_composite_container.cc \ python/google/protobuf/pyext/repeated_scalar_container.h \ python/google/protobuf/pyext/repeated_scalar_container.cc \ - python/google/protobuf/pyext/scalar_map_container.cc \ - python/google/protobuf/pyext/scalar_map_container.h \ python/google/protobuf/pyext/scoped_pyobject_ptr.h \ python/google/protobuf/pyext/__init__.py \ python/google/protobuf/descriptor.py \ |