Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: third_party/protobuf/src/Makefile.am

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/protobuf/ruby/travis-test.sh ('k') | third_party/protobuf/src/README.md » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## Process this file with automake to produce Makefile.in 1 ## Process this file with automake to produce Makefile.in
2 2
3 if HAVE_ZLIB 3 if HAVE_ZLIB
4 GZCHECKPROGRAMS = zcgzip zcgunzip 4 GZCHECKPROGRAMS = zcgzip zcgunzip
5 GZHEADERS = google/protobuf/io/gzip_stream.h 5 GZHEADERS = google/protobuf/io/gzip_stream.h
6 GZTESTS = google/protobuf/io/gzip_stream_unittest.sh 6 GZTESTS = google/protobuf/io/gzip_stream_unittest.sh
7 ZLIB_DEF = -DHAVE_ZLIB=1 7 ZLIB_DEF = -DHAVE_ZLIB=1
8 else 8 else
9 GZCHECKPROGRAMS = 9 GZCHECKPROGRAMS =
10 GZHEADERS = 10 GZHEADERS =
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 google/protobuf/compiler/java/java_enum.cc \ 335 google/protobuf/compiler/java/java_enum.cc \
336 google/protobuf/compiler/java/java_enum_lite.cc \ 336 google/protobuf/compiler/java/java_enum_lite.cc \
337 google/protobuf/compiler/java/java_enum_field.cc \ 337 google/protobuf/compiler/java/java_enum_field.cc \
338 google/protobuf/compiler/java/java_enum_field.h \ 338 google/protobuf/compiler/java/java_enum_field.h \
339 google/protobuf/compiler/java/java_enum_field_lite.cc \ 339 google/protobuf/compiler/java/java_enum_field_lite.cc \
340 google/protobuf/compiler/java/java_enum_field_lite.h \ 340 google/protobuf/compiler/java/java_enum_field_lite.h \
341 google/protobuf/compiler/java/java_enum.h \ 341 google/protobuf/compiler/java/java_enum.h \
342 google/protobuf/compiler/java/java_enum_lite.h \ 342 google/protobuf/compiler/java/java_enum_lite.h \
343 google/protobuf/compiler/java/java_extension.cc \ 343 google/protobuf/compiler/java/java_extension.cc \
344 google/protobuf/compiler/java/java_extension.h \ 344 google/protobuf/compiler/java/java_extension.h \
345 google/protobuf/compiler/java/java_extension_lite.cc \
346 google/protobuf/compiler/java/java_extension_lite.h \
345 google/protobuf/compiler/java/java_field.cc \ 347 google/protobuf/compiler/java/java_field.cc \
346 google/protobuf/compiler/java/java_field.h \ 348 google/protobuf/compiler/java/java_field.h \
347 google/protobuf/compiler/java/java_file.cc \ 349 google/protobuf/compiler/java/java_file.cc \
348 google/protobuf/compiler/java/java_file.h \ 350 google/protobuf/compiler/java/java_file.h \
349 google/protobuf/compiler/java/java_generator.cc \ 351 google/protobuf/compiler/java/java_generator.cc \
350 google/protobuf/compiler/java/java_generator_factory.cc \ 352 google/protobuf/compiler/java/java_generator_factory.cc \
351 google/protobuf/compiler/java/java_generator_factory.h \ 353 google/protobuf/compiler/java/java_generator_factory.h \
352 google/protobuf/compiler/java/java_helpers.cc \ 354 google/protobuf/compiler/java/java_helpers.cc \
353 google/protobuf/compiler/java/java_helpers.h \ 355 google/protobuf/compiler/java/java_helpers.h \
354 google/protobuf/compiler/java/java_lazy_message_field.cc \ 356 google/protobuf/compiler/java/java_lazy_message_field.cc \
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 google/protobuf/compiler/csharp/csharp_field_base.h \ 448 google/protobuf/compiler/csharp/csharp_field_base.h \
447 google/protobuf/compiler/csharp/csharp_generator.cc \ 449 google/protobuf/compiler/csharp/csharp_generator.cc \
448 google/protobuf/compiler/csharp/csharp_helpers.cc \ 450 google/protobuf/compiler/csharp/csharp_helpers.cc \
449 google/protobuf/compiler/csharp/csharp_helpers.h \ 451 google/protobuf/compiler/csharp/csharp_helpers.h \
450 google/protobuf/compiler/csharp/csharp_map_field.cc \ 452 google/protobuf/compiler/csharp/csharp_map_field.cc \
451 google/protobuf/compiler/csharp/csharp_map_field.h \ 453 google/protobuf/compiler/csharp/csharp_map_field.h \
452 google/protobuf/compiler/csharp/csharp_message.cc \ 454 google/protobuf/compiler/csharp/csharp_message.cc \
453 google/protobuf/compiler/csharp/csharp_message.h \ 455 google/protobuf/compiler/csharp/csharp_message.h \
454 google/protobuf/compiler/csharp/csharp_message_field.cc \ 456 google/protobuf/compiler/csharp/csharp_message_field.cc \
455 google/protobuf/compiler/csharp/csharp_message_field.h \ 457 google/protobuf/compiler/csharp/csharp_message_field.h \
458 google/protobuf/compiler/csharp/csharp_options.h \
456 google/protobuf/compiler/csharp/csharp_primitive_field.cc \ 459 google/protobuf/compiler/csharp/csharp_primitive_field.cc \
457 google/protobuf/compiler/csharp/csharp_primitive_field.h \ 460 google/protobuf/compiler/csharp/csharp_primitive_field.h \
458 google/protobuf/compiler/csharp/csharp_reflection_class.cc \ 461 google/protobuf/compiler/csharp/csharp_reflection_class.cc \
459 google/protobuf/compiler/csharp/csharp_reflection_class.h \ 462 google/protobuf/compiler/csharp/csharp_reflection_class.h \
460 google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc \ 463 google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc \
461 google/protobuf/compiler/csharp/csharp_repeated_enum_field.h \ 464 google/protobuf/compiler/csharp/csharp_repeated_enum_field.h \
462 google/protobuf/compiler/csharp/csharp_repeated_message_field.cc \ 465 google/protobuf/compiler/csharp/csharp_repeated_message_field.cc \
463 google/protobuf/compiler/csharp/csharp_repeated_message_field.h \ 466 google/protobuf/compiler/csharp/csharp_repeated_message_field.h \
464 google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc \ 467 google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc \
465 google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h \ 468 google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h \
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 google/protobuf/unittest_no_arena_lite.proto \ 500 google/protobuf/unittest_no_arena_lite.proto \
498 google/protobuf/unittest_no_arena_import.proto \ 501 google/protobuf/unittest_no_arena_import.proto \
499 google/protobuf/unittest_no_arena.proto \ 502 google/protobuf/unittest_no_arena.proto \
500 google/protobuf/unittest_no_field_presence.proto \ 503 google/protobuf/unittest_no_field_presence.proto \
501 google/protobuf/unittest_no_generic_services.proto \ 504 google/protobuf/unittest_no_generic_services.proto \
502 google/protobuf/unittest_optimize_for.proto \ 505 google/protobuf/unittest_optimize_for.proto \
503 google/protobuf/unittest_preserve_unknown_enum2.proto \ 506 google/protobuf/unittest_preserve_unknown_enum2.proto \
504 google/protobuf/unittest_preserve_unknown_enum.proto \ 507 google/protobuf/unittest_preserve_unknown_enum.proto \
505 google/protobuf/unittest.proto \ 508 google/protobuf/unittest.proto \
506 google/protobuf/unittest_proto3_arena.proto \ 509 google/protobuf/unittest_proto3_arena.proto \
510 google/protobuf/unittest_proto3_arena_lite.proto \
511 google/protobuf/unittest_proto3_lite.proto \
507 google/protobuf/unittest_well_known_types.proto \ 512 google/protobuf/unittest_well_known_types.proto \
508 google/protobuf/util/internal/testdata/anys.proto \ 513 google/protobuf/util/internal/testdata/anys.proto \
509 google/protobuf/util/internal/testdata/books.proto \ 514 google/protobuf/util/internal/testdata/books.proto \
510 google/protobuf/util/internal/testdata/default_value.proto \ 515 google/protobuf/util/internal/testdata/default_value.proto \
511 google/protobuf/util/internal/testdata/default_value_test.proto \ 516 google/protobuf/util/internal/testdata/default_value_test.proto \
512 google/protobuf/util/internal/testdata/field_mask.proto \ 517 google/protobuf/util/internal/testdata/field_mask.proto \
513 google/protobuf/util/internal/testdata/maps.proto \ 518 google/protobuf/util/internal/testdata/maps.proto \
514 google/protobuf/util/internal/testdata/oneofs.proto \ 519 google/protobuf/util/internal/testdata/oneofs.proto \
515 google/protobuf/util/internal/testdata/struct.proto \ 520 google/protobuf/util/internal/testdata/struct.proto \
516 google/protobuf/util/internal/testdata/timestamp_duration.proto \ 521 google/protobuf/util/internal/testdata/timestamp_duration.proto \
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 google/protobuf/unittest_optimize_for.pb.cc \ 604 google/protobuf/unittest_optimize_for.pb.cc \
600 google/protobuf/unittest_optimize_for.pb.h \ 605 google/protobuf/unittest_optimize_for.pb.h \
601 google/protobuf/unittest.pb.cc \ 606 google/protobuf/unittest.pb.cc \
602 google/protobuf/unittest.pb.h \ 607 google/protobuf/unittest.pb.h \
603 google/protobuf/unittest_preserve_unknown_enum2.pb.cc \ 608 google/protobuf/unittest_preserve_unknown_enum2.pb.cc \
604 google/protobuf/unittest_preserve_unknown_enum2.pb.h \ 609 google/protobuf/unittest_preserve_unknown_enum2.pb.h \
605 google/protobuf/unittest_preserve_unknown_enum.pb.cc \ 610 google/protobuf/unittest_preserve_unknown_enum.pb.cc \
606 google/protobuf/unittest_preserve_unknown_enum.pb.h \ 611 google/protobuf/unittest_preserve_unknown_enum.pb.h \
607 google/protobuf/unittest_proto3_arena.pb.cc \ 612 google/protobuf/unittest_proto3_arena.pb.cc \
608 google/protobuf/unittest_proto3_arena.pb.h \ 613 google/protobuf/unittest_proto3_arena.pb.h \
614 google/protobuf/unittest_proto3_arena_lite.pb.cc \
615 google/protobuf/unittest_proto3_arena_lite.pb.h \
616 google/protobuf/unittest_proto3_lite.pb.cc \
617 google/protobuf/unittest_proto3_lite.pb.h \
609 google/protobuf/unittest_well_known_types.pb.cc \ 618 google/protobuf/unittest_well_known_types.pb.cc \
610 google/protobuf/unittest_well_known_types.pb.h \ 619 google/protobuf/unittest_well_known_types.pb.h \
611 google/protobuf/util/internal/testdata/anys.pb.cc \ 620 google/protobuf/util/internal/testdata/anys.pb.cc \
612 google/protobuf/util/internal/testdata/anys.pb.h \ 621 google/protobuf/util/internal/testdata/anys.pb.h \
613 google/protobuf/util/internal/testdata/books.pb.cc \ 622 google/protobuf/util/internal/testdata/books.pb.cc \
614 google/protobuf/util/internal/testdata/books.pb.h \ 623 google/protobuf/util/internal/testdata/books.pb.h \
615 google/protobuf/util/internal/testdata/default_value.pb.cc \ 624 google/protobuf/util/internal/testdata/default_value.pb.cc \
616 google/protobuf/util/internal/testdata/default_value.pb.h \ 625 google/protobuf/util/internal/testdata/default_value.pb.h \
617 google/protobuf/util/internal/testdata/default_value_test.pb.cc \ 626 google/protobuf/util/internal/testdata/default_value_test.pb.cc \
618 google/protobuf/util/internal/testdata/default_value_test.pb.h \ 627 google/protobuf/util/internal/testdata/default_value_test.pb.h \
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 google/protobuf/drop_unknown_fields_test.cc \ 709 google/protobuf/drop_unknown_fields_test.cc \
701 google/protobuf/dynamic_message_unittest.cc \ 710 google/protobuf/dynamic_message_unittest.cc \
702 google/protobuf/extension_set_unittest.cc \ 711 google/protobuf/extension_set_unittest.cc \
703 google/protobuf/generated_message_reflection_unittest.cc \ 712 google/protobuf/generated_message_reflection_unittest.cc \
704 google/protobuf/map_field_test.cc \ 713 google/protobuf/map_field_test.cc \
705 google/protobuf/map_test.cc \ 714 google/protobuf/map_test.cc \
706 google/protobuf/message_unittest.cc \ 715 google/protobuf/message_unittest.cc \
707 google/protobuf/no_field_presence_test.cc \ 716 google/protobuf/no_field_presence_test.cc \
708 google/protobuf/preserve_unknown_enum_test.cc \ 717 google/protobuf/preserve_unknown_enum_test.cc \
709 google/protobuf/proto3_arena_unittest.cc \ 718 google/protobuf/proto3_arena_unittest.cc \
719 google/protobuf/proto3_arena_lite_unittest.cc \
720 google/protobuf/proto3_lite_unittest.cc \
710 google/protobuf/reflection_ops_unittest.cc \ 721 google/protobuf/reflection_ops_unittest.cc \
711 google/protobuf/repeated_field_reflection_unittest.cc \ 722 google/protobuf/repeated_field_reflection_unittest.cc \
712 google/protobuf/repeated_field_unittest.cc \ 723 google/protobuf/repeated_field_unittest.cc \
713 google/protobuf/text_format_unittest.cc \ 724 google/protobuf/text_format_unittest.cc \
714 google/protobuf/unknown_field_set_unittest.cc \ 725 google/protobuf/unknown_field_set_unittest.cc \
715 google/protobuf/well_known_types_unittest.cc \ 726 google/protobuf/well_known_types_unittest.cc \
716 google/protobuf/wire_format_unittest.cc \ 727 google/protobuf/wire_format_unittest.cc \
717 google/protobuf/io/coded_stream_unittest.cc \ 728 google/protobuf/io/coded_stream_unittest.cc \
718 google/protobuf/io/printer_unittest.cc \ 729 google/protobuf/io/printer_unittest.cc \
719 google/protobuf/io/tokenizer_unittest.cc \ 730 google/protobuf/io/tokenizer_unittest.cc \
720 google/protobuf/io/zero_copy_stream_unittest.cc \ 731 google/protobuf/io/zero_copy_stream_unittest.cc \
721 google/protobuf/compiler/command_line_interface_unittest.cc \ 732 google/protobuf/compiler/command_line_interface_unittest.cc \
722 google/protobuf/compiler/importer_unittest.cc \ 733 google/protobuf/compiler/importer_unittest.cc \
723 google/protobuf/compiler/mock_code_generator.cc \ 734 google/protobuf/compiler/mock_code_generator.cc \
724 google/protobuf/compiler/mock_code_generator.h \ 735 google/protobuf/compiler/mock_code_generator.h \
725 google/protobuf/compiler/parser_unittest.cc \ 736 google/protobuf/compiler/parser_unittest.cc \
726 google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc \ 737 google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc \
727 google/protobuf/compiler/cpp/cpp_unittest.h \ 738 google/protobuf/compiler/cpp/cpp_unittest.h \
728 google/protobuf/compiler/cpp/cpp_unittest.cc \ 739 google/protobuf/compiler/cpp/cpp_unittest.cc \
729 google/protobuf/compiler/cpp/cpp_plugin_unittest.cc \ 740 google/protobuf/compiler/cpp/cpp_plugin_unittest.cc \
741 google/protobuf/compiler/cpp/metadata_test.cc \
730 google/protobuf/compiler/java/java_plugin_unittest.cc \ 742 google/protobuf/compiler/java/java_plugin_unittest.cc \
731 google/protobuf/compiler/java/java_doc_comment_unittest.cc \ 743 google/protobuf/compiler/java/java_doc_comment_unittest.cc \
732 google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc \ 744 google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc \
733 google/protobuf/compiler/python/python_plugin_unittest.cc \ 745 google/protobuf/compiler/python/python_plugin_unittest.cc \
734 google/protobuf/compiler/ruby/ruby_generator_unittest.cc \ 746 google/protobuf/compiler/ruby/ruby_generator_unittest.cc \
735 google/protobuf/compiler/csharp/csharp_generator_unittest.cc \ 747 google/protobuf/compiler/csharp/csharp_generator_unittest.cc \
736 google/protobuf/util/field_comparator_test.cc \ 748 google/protobuf/util/field_comparator_test.cc \
737 google/protobuf/util/field_mask_util_test.cc \ 749 google/protobuf/util/field_mask_util_test.cc \
738 google/protobuf/util/internal/default_value_objectwriter_test.cc \ 750 google/protobuf/util/internal/default_value_objectwriter_test.cc \
739 google/protobuf/util/internal/json_objectwriter_test.cc \ 751 google/protobuf/util/internal/json_objectwriter_test.cc \
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la 825 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
814 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc 826 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc
815 827
816 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la 828 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
817 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc 829 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc
818 endif 830 endif
819 831
820 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ 832 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
821 google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ 833 google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
822 protobuf-lite-arena-test 834 protobuf-lite-arena-test
OLDNEW
« no previous file with comments | « third_party/protobuf/ruby/travis-test.sh ('k') | third_party/protobuf/src/README.md » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698