Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/src/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
 if HAVE_ZLIB
 GZCHECKPROGRAMS = zcgzip zcgunzip
 GZHEADERS = google/protobuf/io/gzip_stream.h
 GZTESTS = google/protobuf/io/gzip_stream_unittest.sh
 ZLIB_DEF = -DHAVE_ZLIB=1
 else
 GZCHECKPROGRAMS =
 GZHEADERS =
 GZTESTS =
 ZLIB_DEF =
 endif
 
 if HAVE_PTHREAD
 PTHREAD_DEF = -DHAVE_PTHREAD=1
 else
 PTHREAD_DEF =
 endif
 
 if GCC
-# Turn on all warnings except for sign comparison (we ignore sign comparison
-# in Google so our code base have tons of such warnings).
-NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) -Wall -Wno-sign-compare
+# These are good warnings to turn on by default
+NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare
 else
 NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF)
 endif
 
 AM_CXXFLAGS = $(NO_OPT_CXXFLAGS) $(PROTOBUF_OPT_FLAG)
 
 AM_LDFLAGS = $(PTHREAD_CFLAGS)
 
 # If I say "dist_include_DATA", automake complains that $(includedir) is not
 # a "legitimate" directory for DATA.  Screw you, automake.
 protodir = $(includedir)
-
-# If you are adding new files here, also remember to change the build files for
-# all other languages, //protoc-artifacts/build-zip.sh and run
-# //update_file_list.sh for bazel.
 nobase_dist_proto_DATA = google/protobuf/descriptor.proto     \
                          google/protobuf/any.proto            \
                          google/protobuf/api.proto            \
                          google/protobuf/duration.proto       \
                          google/protobuf/empty.proto          \
                          google/protobuf/field_mask.proto     \
                          google/protobuf/source_context.proto \
                          google/protobuf/struct.proto         \
                          google/protobuf/timestamp.proto      \
                          google/protobuf/type.proto           \
                          google/protobuf/wrappers.proto       \
                          google/protobuf/compiler/plugin.proto
 
 # Not sure why these don't get cleaned automatically.
 clean-local:
         rm -f *.loT
 
 CLEANFILES = $(protoc_outputs) unittest_proto_middleman \
-             testzip.jar testzip.list testzip.proto testzip.zip \
-             no_warning_test.cc \
-             google/protobuf/compiler/js/well_known_types_embed.cc
+             testzip.jar testzip.list testzip.proto testzip.zip
 
 MAINTAINERCLEANFILES =   \
   Makefile.in
 
-nobase_include_HEADERS =                                         \
-  google/protobuf/stubs/atomic_sequence_num.h                    \
-  google/protobuf/stubs/atomicops.h                              \
-  google/protobuf/stubs/atomicops_internals_power.h              \
-  google/protobuf/stubs/atomicops_internals_ppc_gcc.h            \
-  google/protobuf/stubs/atomicops_internals_arm64_gcc.h          \
-  google/protobuf/stubs/atomicops_internals_arm_gcc.h            \
-  google/protobuf/stubs/atomicops_internals_arm_qnx.h            \
-  google/protobuf/stubs/atomicops_internals_atomicword_compat.h  \
-  google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h \
-  google/protobuf/stubs/atomicops_internals_generic_gcc.h        \
-  google/protobuf/stubs/atomicops_internals_macosx.h             \
-  google/protobuf/stubs/atomicops_internals_mips_gcc.h           \
-  google/protobuf/stubs/atomicops_internals_solaris.h            \
-  google/protobuf/stubs/atomicops_internals_tsan.h               \
-  google/protobuf/stubs/atomicops_internals_x86_gcc.h            \
-  google/protobuf/stubs/atomicops_internals_x86_msvc.h           \
-  google/protobuf/stubs/callback.h                               \
-  google/protobuf/stubs/bytestream.h                             \
-  google/protobuf/stubs/casts.h                                  \
-  google/protobuf/stubs/common.h                                 \
-  google/protobuf/stubs/fastmem.h                                \
-  google/protobuf/stubs/hash.h                                   \
-  google/protobuf/stubs/logging.h                                \
-  google/protobuf/stubs/macros.h                                 \
-  google/protobuf/stubs/mutex.h                                  \
-  google/protobuf/stubs/once.h                                   \
-  google/protobuf/stubs/platform_macros.h                        \
-  google/protobuf/stubs/port.h                                   \
-  google/protobuf/stubs/scoped_ptr.h                             \
-  google/protobuf/stubs/shared_ptr.h                             \
-  google/protobuf/stubs/singleton.h                              \
-  google/protobuf/stubs/status.h                                 \
-  google/protobuf/stubs/stl_util.h                               \
-  google/protobuf/stubs/stringpiece.h                            \
-  google/protobuf/stubs/template_util.h                          \
-  google/protobuf/stubs/type_traits.h                            \
-  google/protobuf/any.pb.h                                       \
-  google/protobuf/api.pb.h                                       \
-  google/protobuf/any.h                                          \
-  google/protobuf/arena.h                                        \
-  google/protobuf/arenastring.h                                  \
-  google/protobuf/descriptor_database.h                          \
-  google/protobuf/descriptor.h                                   \
-  google/protobuf/descriptor.pb.h                                \
-  google/protobuf/duration.pb.h                                  \
-  google/protobuf/dynamic_message.h                              \
-  google/protobuf/empty.pb.h                                     \
-  google/protobuf/extension_set.h                                \
-  google/protobuf/field_mask.pb.h                                \
-  google/protobuf/generated_enum_reflection.h                    \
-  google/protobuf/generated_enum_util.h                          \
-  google/protobuf/generated_message_reflection.h                 \
-  google/protobuf/generated_message_util.h                       \
-  google/protobuf/has_bits.h                                     \
-  google/protobuf/map_entry.h                                    \
-  google/protobuf/map_entry_lite.h                               \
-  google/protobuf/map_field.h                                    \
-  google/protobuf/map_field_inl.h                                \
-  google/protobuf/map_field_lite.h                               \
-  google/protobuf/map.h                                          \
-  google/protobuf/map_type_handler.h                             \
-  google/protobuf/message.h                                      \
-  google/protobuf/message_lite.h                                 \
-  google/protobuf/metadata.h                                     \
-  google/protobuf/reflection.h                                   \
-  google/protobuf/reflection_ops.h                               \
-  google/protobuf/repeated_field.h                               \
-  google/protobuf/service.h                                      \
-  google/protobuf/source_context.pb.h                            \
-  google/protobuf/struct.pb.h                                    \
-  google/protobuf/text_format.h                                  \
-  google/protobuf/timestamp.pb.h                                 \
-  google/protobuf/type.pb.h                                      \
-  google/protobuf/unknown_field_set.h                            \
-  google/protobuf/wire_format.h                                  \
-  google/protobuf/wire_format_lite.h                             \
-  google/protobuf/wire_format_lite_inl.h                         \
-  google/protobuf/wrappers.pb.h                                  \
-  google/protobuf/io/coded_stream.h                              \
-  $(GZHEADERS)                                                   \
-  google/protobuf/io/printer.h                                   \
-  google/protobuf/io/strtod.h                                    \
-  google/protobuf/io/tokenizer.h                                 \
-  google/protobuf/io/zero_copy_stream.h                          \
-  google/protobuf/io/zero_copy_stream_impl.h                     \
-  google/protobuf/io/zero_copy_stream_impl_lite.h                \
-  google/protobuf/compiler/code_generator.h                      \
-  google/protobuf/compiler/command_line_interface.h              \
-  google/protobuf/compiler/importer.h                            \
-  google/protobuf/compiler/parser.h                              \
-  google/protobuf/compiler/plugin.h                              \
-  google/protobuf/compiler/plugin.pb.h                           \
-  google/protobuf/compiler/cpp/cpp_generator.h                   \
-  google/protobuf/compiler/csharp/csharp_generator.h             \
-  google/protobuf/compiler/csharp/csharp_names.h                 \
-  google/protobuf/compiler/java/java_generator.h                 \
-  google/protobuf/compiler/java/java_names.h                     \
-  google/protobuf/compiler/javanano/javanano_generator.h         \
-  google/protobuf/compiler/js/js_generator.h                     \
-  google/protobuf/compiler/js/well_known_types_embed.h           \
-  google/protobuf/compiler/objectivec/objectivec_generator.h     \
-  google/protobuf/compiler/objectivec/objectivec_helpers.h       \
-  google/protobuf/compiler/php/php_generator.h                   \
-  google/protobuf/compiler/python/python_generator.h             \
-  google/protobuf/compiler/ruby/ruby_generator.h                 \
-  google/protobuf/util/type_resolver.h                           \
-  google/protobuf/util/field_comparator.h                        \
-  google/protobuf/util/field_mask_util.h                         \
-  google/protobuf/util/json_util.h                               \
-  google/protobuf/util/time_util.h                               \
-  google/protobuf/util/type_resolver_util.h                      \
+nobase_include_HEADERS =                                        \
+  google/protobuf/stubs/atomic_sequence_num.h                   \
+  google/protobuf/stubs/atomicops.h                             \
+  google/protobuf/stubs/atomicops_internals_power.h             \
+  google/protobuf/stubs/atomicops_internals_arm64_gcc.h         \
+  google/protobuf/stubs/atomicops_internals_arm_gcc.h           \
+  google/protobuf/stubs/atomicops_internals_arm_qnx.h           \
+  google/protobuf/stubs/atomicops_internals_atomicword_compat.h \
+  google/protobuf/stubs/atomicops_internals_generic_gcc.h       \
+  google/protobuf/stubs/atomicops_internals_macosx.h            \
+  google/protobuf/stubs/atomicops_internals_mips_gcc.h          \
+  google/protobuf/stubs/atomicops_internals_pnacl.h             \
+  google/protobuf/stubs/atomicops_internals_solaris.h           \
+  google/protobuf/stubs/atomicops_internals_tsan.h              \
+  google/protobuf/stubs/atomicops_internals_x86_gcc.h           \
+  google/protobuf/stubs/atomicops_internals_x86_msvc.h          \
+  google/protobuf/stubs/callback.h                              \
+  google/protobuf/stubs/bytestream.h                            \
+  google/protobuf/stubs/casts.h                                 \
+  google/protobuf/stubs/common.h                                \
+  google/protobuf/stubs/fastmem.h                               \
+  google/protobuf/stubs/hash.h                                  \
+  google/protobuf/stubs/logging.h                               \
+  google/protobuf/stubs/macros.h                                \
+  google/protobuf/stubs/mutex.h                                 \
+  google/protobuf/stubs/once.h                                  \
+  google/protobuf/stubs/platform_macros.h                       \
+  google/protobuf/stubs/port.h                                  \
+  google/protobuf/stubs/scoped_ptr.h                            \
+  google/protobuf/stubs/shared_ptr.h                            \
+  google/protobuf/stubs/singleton.h                             \
+  google/protobuf/stubs/status.h                                \
+  google/protobuf/stubs/stl_util.h                              \
+  google/protobuf/stubs/stringpiece.h                           \
+  google/protobuf/stubs/template_util.h                         \
+  google/protobuf/stubs/type_traits.h                           \
+  google/protobuf/any.pb.h                                      \
+  google/protobuf/api.pb.h                                      \
+  google/protobuf/any.h                                         \
+  google/protobuf/arena.h                                       \
+  google/protobuf/arenastring.h                                 \
+  google/protobuf/descriptor_database.h                         \
+  google/protobuf/descriptor.h                                  \
+  google/protobuf/descriptor.pb.h                               \
+  google/protobuf/duration.pb.h                                 \
+  google/protobuf/dynamic_message.h                             \
+  google/protobuf/empty.pb.h                                    \
+  google/protobuf/extension_set.h                               \
+  google/protobuf/field_mask.pb.h                               \
+  google/protobuf/generated_enum_reflection.h                   \
+  google/protobuf/generated_enum_util.h                         \
+  google/protobuf/generated_message_reflection.h                \
+  google/protobuf/generated_message_util.h                      \
+  google/protobuf/map_entry.h                                   \
+  google/protobuf/map_entry_lite.h                              \
+  google/protobuf/map_field.h                                   \
+  google/protobuf/map_field_inl.h                               \
+  google/protobuf/map_field_lite.h                              \
+  google/protobuf/map.h                                         \
+  google/protobuf/map_type_handler.h                            \
+  google/protobuf/message.h                                     \
+  google/protobuf/message_lite.h                                \
+  google/protobuf/metadata.h                                    \
+  google/protobuf/reflection.h                                  \
+  google/protobuf/reflection_ops.h                              \
+  google/protobuf/repeated_field.h                              \
+  google/protobuf/repeated_field_reflection.h                   \
+  google/protobuf/service.h                                     \
+  google/protobuf/source_context.pb.h                           \
+  google/protobuf/struct.pb.h                                   \
+  google/protobuf/text_format.h                                 \
+  google/protobuf/timestamp.pb.h                                \
+  google/protobuf/type.pb.h                                     \
+  google/protobuf/unknown_field_set.h                           \
+  google/protobuf/wire_format.h                                 \
+  google/protobuf/wire_format_lite.h                            \
+  google/protobuf/wire_format_lite_inl.h                        \
+  google/protobuf/wrappers.pb.h                                 \
+  google/protobuf/io/coded_stream.h                             \
+  $(GZHEADERS)                                                  \
+  google/protobuf/io/printer.h                                  \
+  google/protobuf/io/strtod.h                                   \
+  google/protobuf/io/tokenizer.h                                \
+  google/protobuf/io/zero_copy_stream.h                         \
+  google/protobuf/io/zero_copy_stream_impl.h                    \
+  google/protobuf/io/zero_copy_stream_impl_lite.h               \
+  google/protobuf/compiler/code_generator.h                     \
+  google/protobuf/compiler/command_line_interface.h             \
+  google/protobuf/compiler/importer.h                           \
+  google/protobuf/compiler/parser.h                             \
+  google/protobuf/compiler/plugin.h                             \
+  google/protobuf/compiler/plugin.pb.h                          \
+  google/protobuf/compiler/cpp/cpp_generator.h                  \
+  google/protobuf/compiler/csharp/csharp_generator.h            \
+  google/protobuf/compiler/csharp/csharp_names.h                \
+  google/protobuf/compiler/java/java_generator.h                \
+  google/protobuf/compiler/java/java_names.h                    \
+  google/protobuf/compiler/javanano/javanano_generator.h        \
+  google/protobuf/compiler/js/js_generator.h                    \
+  google/protobuf/compiler/objectivec/objectivec_generator.h    \
+  google/protobuf/compiler/objectivec/objectivec_helpers.h      \
+  google/protobuf/compiler/python/python_generator.h            \
+  google/protobuf/compiler/ruby/ruby_generator.h                \
+  google/protobuf/util/type_resolver.h                          \
+  google/protobuf/util/field_comparator.h                       \
+  google/protobuf/util/field_mask_util.h                        \
+  google/protobuf/util/json_util.h                              \
+  google/protobuf/util/time_util.h                              \
+  google/protobuf/util/type_resolver_util.h                     \
   google/protobuf/util/message_differencer.h
 
 lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
 
 libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
-libprotobuf_lite_la_LDFLAGS = -version-info 11:0:0 -export-dynamic -no-undefined
+libprotobuf_lite_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined
 libprotobuf_lite_la_SOURCES =                                  \
   google/protobuf/stubs/atomicops_internals_x86_gcc.cc         \
   google/protobuf/stubs/atomicops_internals_x86_msvc.cc        \
   google/protobuf/stubs/bytestream.cc                          \
   google/protobuf/stubs/bytestream.h                           \
   google/protobuf/stubs/common.cc                              \
   google/protobuf/stubs/hash.h                                 \
   google/protobuf/stubs/int128.cc                              \
   google/protobuf/stubs/int128.h                               \
   google/protobuf/stubs/map_util.h                             \
@@ skipping 20 matching lines @@
   google/protobuf/generated_message_util.cc                    \
   google/protobuf/message_lite.cc                              \
   google/protobuf/repeated_field.cc                            \
   google/protobuf/wire_format_lite.cc                          \
   google/protobuf/io/coded_stream.cc                           \
   google/protobuf/io/coded_stream_inl.h                        \
   google/protobuf/io/zero_copy_stream.cc                       \
   google/protobuf/io/zero_copy_stream_impl_lite.cc
 
 libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
-libprotobuf_la_LDFLAGS = -version-info 11:0:0 -export-dynamic -no-undefined
+libprotobuf_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined
 libprotobuf_la_SOURCES =                                       \
   $(libprotobuf_lite_la_SOURCES)                               \
   google/protobuf/any.pb.cc                                    \
   google/protobuf/api.pb.cc                                    \
   google/protobuf/stubs/mathlimits.cc                          \
   google/protobuf/stubs/mathlimits.h                           \
   google/protobuf/any.cc                                       \
   google/protobuf/descriptor.cc                                \
   google/protobuf/descriptor_database.cc                       \
   google/protobuf/descriptor.pb.cc                             \
@@ skipping 63 matching lines @@
   google/protobuf/util/internal/utility.cc                     \
   google/protobuf/util/internal/utility.h                      \
   google/protobuf/util/json_util.cc                            \
   google/protobuf/util/message_differencer.cc                  \
   google/protobuf/util/time_util.cc                            \
   google/protobuf/util/type_resolver_util.cc
 
 nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES)
 
 libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
-libprotoc_la_LDFLAGS = -version-info 11:0:0 -export-dynamic -no-undefined
+libprotoc_la_LDFLAGS = -version-info 10:0:0 -export-dynamic -no-undefined
 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                       \
   google/protobuf/compiler/zip_writer.h                        \
   google/protobuf/compiler/cpp/cpp_enum.cc                     \
@@ skipping 60 matching lines @@
   google/protobuf/compiler/java/java_message_field.cc          \
   google/protobuf/compiler/java/java_message_field.h           \
   google/protobuf/compiler/java/java_message_field_lite.cc     \
   google/protobuf/compiler/java/java_message_field_lite.h      \
   google/protobuf/compiler/java/java_message.h                 \
   google/protobuf/compiler/java/java_message_lite.h            \
   google/protobuf/compiler/java/java_message_builder.h         \
   google/protobuf/compiler/java/java_message_builder_lite.h    \
   google/protobuf/compiler/java/java_name_resolver.cc          \
   google/protobuf/compiler/java/java_name_resolver.h           \
-  google/protobuf/compiler/java/java_options.h                 \
   google/protobuf/compiler/java/java_primitive_field.cc        \
   google/protobuf/compiler/java/java_primitive_field.h         \
   google/protobuf/compiler/java/java_primitive_field_lite.cc   \
   google/protobuf/compiler/java/java_primitive_field_lite.h    \
   google/protobuf/compiler/java/java_shared_code_generator.cc  \
   google/protobuf/compiler/java/java_shared_code_generator.h   \
   google/protobuf/compiler/java/java_service.cc                \
   google/protobuf/compiler/java/java_service.h                 \
   google/protobuf/compiler/java/java_string_field.cc           \
   google/protobuf/compiler/java/java_string_field.h            \
   google/protobuf/compiler/java/java_string_field_lite.cc      \
   google/protobuf/compiler/java/java_string_field_lite.h       \
   google/protobuf/compiler/java/java_doc_comment.cc            \
   google/protobuf/compiler/java/java_doc_comment.h             \
   google/protobuf/compiler/js/js_generator.cc                  \
-  google/protobuf/compiler/js/well_known_types_embed.cc        \
   google/protobuf/compiler/javanano/javanano_enum.cc           \
   google/protobuf/compiler/javanano/javanano_enum.h            \
   google/protobuf/compiler/javanano/javanano_enum_field.cc     \
   google/protobuf/compiler/javanano/javanano_enum_field.h      \
   google/protobuf/compiler/javanano/javanano_extension.cc      \
   google/protobuf/compiler/javanano/javanano_extension.h       \
   google/protobuf/compiler/javanano/javanano_field.cc          \
   google/protobuf/compiler/javanano/javanano_field.h           \
   google/protobuf/compiler/javanano/javanano_file.cc           \
   google/protobuf/compiler/javanano/javanano_file.h            \
@@ skipping 26 matching lines @@
   google/protobuf/compiler/objectivec/objectivec_map_field.cc  \
   google/protobuf/compiler/objectivec/objectivec_map_field.h   \
   google/protobuf/compiler/objectivec/objectivec_message.cc    \
   google/protobuf/compiler/objectivec/objectivec_message.h     \
   google/protobuf/compiler/objectivec/objectivec_message_field.cc \
   google/protobuf/compiler/objectivec/objectivec_message_field.h \
   google/protobuf/compiler/objectivec/objectivec_oneof.cc      \
   google/protobuf/compiler/objectivec/objectivec_oneof.h       \
   google/protobuf/compiler/objectivec/objectivec_primitive_field.cc \
   google/protobuf/compiler/objectivec/objectivec_primitive_field.h \
-  google/protobuf/compiler/php/php_generator.cc                \
   google/protobuf/compiler/python/python_generator.cc          \
   google/protobuf/compiler/ruby/ruby_generator.cc              \
   google/protobuf/compiler/csharp/csharp_doc_comment.cc        \
   google/protobuf/compiler/csharp/csharp_doc_comment.h         \
   google/protobuf/compiler/csharp/csharp_enum.cc               \
   google/protobuf/compiler/csharp/csharp_enum.h                \
   google/protobuf/compiler/csharp/csharp_enum_field.cc         \
   google/protobuf/compiler/csharp/csharp_enum_field.h          \
   google/protobuf/compiler/csharp/csharp_field_base.cc         \
   google/protobuf/compiler/csharp/csharp_field_base.h          \
@@ skipping 15 matching lines @@
   google/protobuf/compiler/csharp/csharp_repeated_enum_field.h \
   google/protobuf/compiler/csharp/csharp_repeated_message_field.cc \
   google/protobuf/compiler/csharp/csharp_repeated_message_field.h \
   google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc \
   google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h \
   google/protobuf/compiler/csharp/csharp_source_generator_base.cc \
   google/protobuf/compiler/csharp/csharp_source_generator_base.h \
   google/protobuf/compiler/csharp/csharp_wrapper_field.cc      \
   google/protobuf/compiler/csharp/csharp_wrapper_field.h
 
-bin_PROGRAMS = protoc js_embed
+bin_PROGRAMS = protoc
 protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la
 protoc_SOURCES = google/protobuf/compiler/main.cc
 
-# The special JS code for the well-known types is linked into the compiler via
-# well_known_types_embed.cc, which is generated from .js source files.
-js_embed_SOURCES = google/protobuf/compiler/js/embed.cc
-js_well_known_types_sources =                                  \
-        google/protobuf/compiler/js/well_known_types/any.js          \
-        google/protobuf/compiler/js/well_known_types/struct.js       \
-        google/protobuf/compiler/js/well_known_types/timestamp.js
-# We have to cd to $(srcdir) so that out-of-tree builds work properly.
-google/protobuf/compiler/js/well_known_types_embed.cc: js_embed$(EXEEXT) $(js_well_known_types_sources)
-        oldpwd=`pwd` && cd $(srcdir) && \
-        $$oldpwd/js_embed$(EXEEXT) $(js_well_known_types_sources) > $$oldpwd/$@
-
 # Tests ==============================================================
 
 protoc_inputs =                                                   \
   google/protobuf/any_test.proto                                  \
   google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto     \
   google/protobuf/map_lite_unittest.proto                         \
   google/protobuf/map_proto2_unittest.proto                       \
   google/protobuf/map_unittest.proto                              \
   google/protobuf/unittest_arena.proto                            \
   google/protobuf/unittest_custom_options.proto                   \
@@ skipping 22 matching lines @@
   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              \
   google/protobuf/util/internal/testdata/default_value.proto      \
   google/protobuf/util/internal/testdata/default_value_test.proto \
   google/protobuf/util/internal/testdata/field_mask.proto         \
   google/protobuf/util/internal/testdata/maps.proto               \
   google/protobuf/util/internal/testdata/oneofs.proto             \
-  google/protobuf/util/internal/testdata/proto3.proto             \
   google/protobuf/util/internal/testdata/struct.proto             \
   google/protobuf/util/internal/testdata/timestamp_duration.proto \
-  google/protobuf/util/internal/testdata/wrappers.proto           \
   google/protobuf/util/json_format_proto3.proto                   \
   google/protobuf/util/message_differencer_unittest.proto         \
   google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
 
 EXTRA_DIST =                                                   \
   $(protoc_inputs)                                             \
-  $(js_well_known_types_sources)                               \
   solaris/libstdc++.la                                         \
   google/protobuf/io/gzip_stream.h                             \
   google/protobuf/io/gzip_stream_unittest.sh                   \
   google/protobuf/testdata/golden_message                      \
-  google/protobuf/testdata/golden_message_maps                 \
   google/protobuf/testdata/golden_message_oneof_implemented    \
   google/protobuf/testdata/golden_message_proto3               \
   google/protobuf/testdata/golden_packed_fields_message        \
   google/protobuf/testdata/bad_utf8_string                     \
   google/protobuf/testdata/map_test_data.txt                   \
   google/protobuf/testdata/text_format_unittest_data.txt       \
   google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt  \
   google/protobuf/testdata/text_format_unittest_data_pointy.txt             \
   google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt       \
   google/protobuf/testdata/text_format_unittest_extensions_data.txt         \
   google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt  \
   google/protobuf/package_info.h                               \
   google/protobuf/io/package_info.h                            \
-  google/protobuf/util/package_info.h                          \
   google/protobuf/compiler/ruby/ruby_generated_code.proto      \
-  google/protobuf/compiler/ruby/ruby_generated_code_pb.rb      \
+  google/protobuf/compiler/ruby/ruby_generated_code.rb         \
   google/protobuf/compiler/package_info.h                      \
-  google/protobuf/compiler/zip_output_unittest.sh              \
-  README.md
+  google/protobuf/compiler/zip_output_unittest.sh
 
 protoc_lite_outputs =                                          \
   google/protobuf/map_lite_unittest.pb.cc                      \
   google/protobuf/map_lite_unittest.pb.h                       \
   google/protobuf/unittest_lite.pb.cc                          \
   google/protobuf/unittest_lite.pb.h                           \
   google/protobuf/unittest_no_arena_lite.pb.cc                 \
   google/protobuf/unittest_no_arena_lite.pb.h                  \
   google/protobuf/unittest_import_lite.pb.cc                   \
   google/protobuf/unittest_import_lite.pb.h                    \
@@ skipping 65 matching lines @@
   google/protobuf/util/internal/testdata/default_value.pb.cc      \
   google/protobuf/util/internal/testdata/default_value.pb.h       \
   google/protobuf/util/internal/testdata/default_value_test.pb.cc \
   google/protobuf/util/internal/testdata/default_value_test.pb.h  \
   google/protobuf/util/internal/testdata/field_mask.pb.cc         \
   google/protobuf/util/internal/testdata/field_mask.pb.h          \
   google/protobuf/util/internal/testdata/maps.pb.cc               \
   google/protobuf/util/internal/testdata/maps.pb.h                \
   google/protobuf/util/internal/testdata/oneofs.pb.cc             \
   google/protobuf/util/internal/testdata/oneofs.pb.h              \
-  google/protobuf/util/internal/testdata/proto3.pb.cc             \
-  google/protobuf/util/internal/testdata/proto3.pb.h              \
   google/protobuf/util/internal/testdata/struct.pb.cc             \
   google/protobuf/util/internal/testdata/struct.pb.h              \
   google/protobuf/util/internal/testdata/timestamp_duration.pb.cc \
   google/protobuf/util/internal/testdata/timestamp_duration.pb.h  \
-  google/protobuf/util/internal/testdata/wrappers.pb.cc           \
-  google/protobuf/util/internal/testdata/wrappers.pb.h            \
   google/protobuf/util/json_format_proto3.pb.cc                   \
   google/protobuf/util/json_format_proto3.pb.h                    \
   google/protobuf/util/message_differencer_unittest.pb.cc         \
   google/protobuf/util/message_differencer_unittest.pb.h
 
-BUILT_SOURCES = $(protoc_outputs) google/protobuf/compiler/js/well_known_types_embed.cc
+BUILT_SOURCES = $(protoc_outputs)
 
 if USE_EXTERNAL_PROTOC
 
 unittest_proto_middleman: $(protoc_inputs)
         $(PROTOC) -I$(srcdir) --cpp_out=. $^
         touch unittest_proto_middleman
 
 else
 
 # We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is
@@ skipping 15 matching lines @@
   google/protobuf/map_test_util_impl.h                         \
   google/protobuf/test_util.cc                                 \
   google/protobuf/test_util.h                                  \
   google/protobuf/testing/googletest.cc                        \
   google/protobuf/testing/googletest.h                         \
   google/protobuf/testing/file.cc                              \
   google/protobuf/testing/file.h
 
 check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                 no-warning-test $(GZCHECKPROGRAMS)
+                 $(GZCHECKPROGRAMS)
 protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
                       ../gmock/gtest/lib/libgtest.la              \
                       ../gmock/lib/libgmock.la                    \
                       ../gmock/lib/libgmock_main.la
 protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \
                          -I$(srcdir)/../gmock/include
 # Disable optimization for tests unless the user explicitly asked for it,
 # since test_util.cc takes forever to compile with optimization (with GCC).
 # See configure.ac for more info.
 protobuf_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
@@ skipping 132 matching lines @@
   google/protobuf/compiler/test_plugin.cc
 
 if HAVE_ZLIB
 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc
 
 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc
 endif
 
-# This test target is to ensure all our public header files and generated
-# code is free from warnings. We have to be more pedantic about these
-# files because they are compiled by users with different compiler flags.
-no_warning_test.cc:
-        echo "// Generated from Makefile.am" > no_warning_test.cc
-        for FILE in $(nobase_include_HEADERS); do \
-          if ! echo $${FILE} | grep "atomicops"; then \
-            echo "#include <$${FILE}>" >> no_warning_test.cc; \
-          fi \
-        done
-        echo "#include <gtest/gtest.h>" >> no_warning_test.cc
-        echo "TEST(NoWarningTest, Empty) {}" >> no_warning_test.cc
-
-no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la      \
-                        ../gmock/gtest/lib/libgtest.la      \
-                        ../gmock/gtest/lib/libgtest_main.la
-no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
-no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \
-                           -Wall -Werror
-nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs)
-
 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
-        protobuf-lite-arena-test no-warning-test
+        protobuf-lite-arena-test