aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@gmail.com>2017-03-20 13:02:40 -0700
committerGitHub <noreply@github.com>2017-03-20 13:02:40 -0700
commitffa932bf10d958fc3dff3ac9153f1b4ef55d6024 (patch)
tree75442713bae8fb1b4e1c39d7ac61152e982c8823 /src/Makefile.am
parentdb3ef48ede307f1163c1bbdbaf763d01a8759bb8 (diff)
parent312e2dbcfb4d6f346a681263062ef454a3bd0219 (diff)
downloadprotobuf-ffa932bf10d958fc3dff3ac9153f1b4ef55d6024.tar.gz
protobuf-ffa932bf10d958fc3dff3ac9153f1b4ef55d6024.tar.bz2
protobuf-ffa932bf10d958fc3dff3ac9153f1b4ef55d6024.zip
Merge pull request #2861 from byronyi/#710
migrate delimited messages functions to util package
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a91044d..bcd81576 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -169,6 +169,7 @@ nobase_include_HEADERS = \
google/protobuf/compiler/python/python_generator.h \
google/protobuf/compiler/ruby/ruby_generator.h \
google/protobuf/util/type_resolver.h \
+ google/protobuf/util/delimited_message_util.h \
google/protobuf/util/field_comparator.h \
google/protobuf/util/field_mask_util.h \
google/protobuf/util/json_util.h \
@@ -267,6 +268,7 @@ libprotobuf_la_SOURCES = \
google/protobuf/io/zero_copy_stream_impl.cc \
google/protobuf/compiler/importer.cc \
google/protobuf/compiler/parser.cc \
+ google/protobuf/util/delimited_message_util.cc \
google/protobuf/util/field_comparator.cc \
google/protobuf/util/field_mask_util.cc \
google/protobuf/util/internal/constants.h \
@@ -800,6 +802,7 @@ protobuf_test_SOURCES = \
google/protobuf/compiler/ruby/ruby_generator_unittest.cc \
google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc \
google/protobuf/compiler/csharp/csharp_generator_unittest.cc \
+ google/protobuf/util/delimited_message_util_test.cc \
google/protobuf/util/field_comparator_test.cc \
google/protobuf/util/field_mask_util_test.cc \
google/protobuf/util/internal/default_value_objectwriter_test.cc \