diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2018-03-09 10:50:23 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-09 10:50:23 -0800 |
| commit | 8e44a86facd0f42af7a3c0c47f8133f78f037269 (patch) | |
| tree | 35d0db4eaf647d99aed490210a0bdc97dbfcb473 /src | |
| parent | 6ebfa148a400691a77174b70a65bec80c446df33 (diff) | |
| parent | fd595fcc93c949d6501a24f213633e007e93fb0c (diff) | |
Merge pull request #4347 from xfxyjwf/pluginpb
Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6eac2e15..af2db52f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -278,7 +278,6 @@ libprotobuf_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl.cc \ google/protobuf/compiler/importer.cc \ google/protobuf/compiler/parser.cc \ - google/protobuf/compiler/plugin.pb.cc \ google/protobuf/util/delimited_message_util.cc \ google/protobuf/util/field_comparator.cc \ google/protobuf/util/field_mask_util.cc \ @@ -334,6 +333,7 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ google/protobuf/compiler/plugin.cc \ + google/protobuf/compiler/plugin.pb.cc \ google/protobuf/compiler/subprocess.cc \ google/protobuf/compiler/subprocess.h \ google/protobuf/compiler/zip_writer.cc \ |