Merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654 into lp:ubuntu/lucid/protobuf
- Lucid (10.04)
- merge-bug502654
- Merge into lucid
Proposed by
Elliot Murphy
Status: | Merged |
---|---|
Merge reported by: | Daniel Holbach |
Merged at revision: | not available |
Proposed branch: | lp:~statik/ubuntu/lucid/protobuf/merge-bug502654 |
Merge into: | lp:ubuntu/lucid/protobuf |
Diff against target: |
248083 lines (+22639/-108557) 345 files modified
CHANGES.txt (+47/-1) CONTRIBUTORS.txt (+2/-0) Makefile.am (+18/-1) Makefile.in (+66/-9) README.txt (+38/-0) autogen.sh (+9/-16) configure (+490/-331) configure.ac (+25/-25) debian/changelog (+36/-0) debian/control (+6/-6) debian/java-build.xml (+1/-1) debian/libprotobuf-dev.install (+1/-0) debian/libprotobuf-java.links (+1/-1) debian/libprotobuf4.install (+0/-1) debian/libprotobuf5.install (+1/-0) debian/libprotobuf5.shlibs (+3/-0) debian/libprotoc-dev.dirs (+0/-1) debian/libprotoc-dev.install (+0/-3) debian/libprotoc4.install (+0/-1) debian/libprotoc5.install (+1/-0) debian/libprotoc5.shlibs (+1/-0) debian/patches/series (+0/-3) debian/rules (+7/-5) editors/protobuf-mode.el (+0/-217) examples/Makefile (+4/-2) examples/add_person.cc (+3/-0) examples/list_people.cc (+3/-0) generate_descriptor_proto.sh (+5/-1) gtest/CHANGES (+0/-57) gtest/CONTRIBUTORS (+0/-33) gtest/COPYING (+0/-28) gtest/Makefile.am (+0/-390) gtest/Makefile.in (+0/-1951) gtest/README (+0/-274) gtest/aclocal.m4 (+0/-8947) gtest/build-aux/config.guess (+0/-1516) gtest/build-aux/config.h.in (+0/-66) gtest/build-aux/config.sub (+0/-1626) gtest/build-aux/depcomp (+0/-589) gtest/build-aux/install-sh (+0/-519) gtest/build-aux/ltmain.sh (+0/-7874) gtest/build-aux/missing (+0/-367) gtest/codegear/gtest.cbproj (+0/-138) gtest/codegear/gtest.groupproj (+0/-54) gtest/codegear/gtest_all.cc (+0/-38) gtest/codegear/gtest_link.cc (+0/-40) gtest/codegear/gtest_main.cbproj (+0/-82) gtest/codegear/gtest_unittest.cbproj (+0/-88) gtest/configure (+0/-18268) gtest/configure.ac (+0/-51) gtest/include/gtest/gtest-death-test.h (+0/-262) gtest/include/gtest/gtest-message.h (+0/-224) gtest/include/gtest/gtest-param-test.h (+0/-1385) gtest/include/gtest/gtest-param-test.h.pump (+0/-453) gtest/include/gtest/gtest-spi.h (+0/-221) gtest/include/gtest/gtest-test-part.h (+0/-179) gtest/include/gtest/gtest-typed-test.h (+0/-253) gtest/include/gtest/gtest.h (+0/-1420) gtest/include/gtest/gtest_pred_impl.h (+0/-368) gtest/include/gtest/gtest_prod.h (+0/-58) gtest/include/gtest/internal/gtest-death-test-internal.h (+0/-227) gtest/include/gtest/internal/gtest-filepath.h (+0/-201) gtest/include/gtest/internal/gtest-internal.h (+0/-890) gtest/include/gtest/internal/gtest-linked_ptr.h (+0/-242) gtest/include/gtest/internal/gtest-param-util-generated.h (+0/-4572) gtest/include/gtest/internal/gtest-param-util-generated.h.pump (+0/-269) gtest/include/gtest/internal/gtest-param-util.h (+0/-629) gtest/include/gtest/internal/gtest-port.h (+0/-1006) gtest/include/gtest/internal/gtest-string.h (+0/-335) gtest/include/gtest/internal/gtest-tuple.h (+966/-0) gtest/include/gtest/internal/gtest-tuple.h.pump (+335/-0) gtest/include/gtest/internal/gtest-type-util.h (+0/-3319) gtest/include/gtest/internal/gtest-type-util.h.pump (+0/-287) gtest/m4/acx_pthread.m4 (+0/-363) gtest/m4/gtest.m4 (+0/-74) gtest/make/Makefile (+0/-78) gtest/msvc/gtest.sln (+0/-85) gtest/msvc/gtest.vcproj (+0/-237) gtest/msvc/gtest_color_test_.vcproj (+0/-144) gtest/msvc/gtest_env_var_test_.vcproj (+0/-144) gtest/msvc/gtest_environment_test.vcproj (+0/-144) gtest/msvc/gtest_main.vcproj (+0/-165) gtest/msvc/gtest_output_test_.vcproj (+0/-147) gtest/msvc/gtest_prod_test.vcproj (+0/-164) gtest/msvc/gtest_uninitialized_test_.vcproj (+0/-144) gtest/msvc/gtest_unittest.vcproj (+0/-147) gtest/samples/prime_tables.h (+0/-120) gtest/samples/sample1.cc (+0/-68) gtest/samples/sample1.h (+0/-43) gtest/samples/sample1_unittest.cc (+0/-153) gtest/samples/sample2.cc (+0/-56) gtest/samples/sample2.h (+0/-86) gtest/samples/sample2_unittest.cc (+0/-109) gtest/samples/sample3-inl.h (+0/-173) gtest/samples/sample3_unittest.cc (+0/-151) gtest/samples/sample4.cc (+0/-46) gtest/samples/sample4.h (+0/-53) gtest/samples/sample4_unittest.cc (+0/-45) gtest/samples/sample5_unittest.cc (+0/-199) gtest/samples/sample6_unittest.cc (+0/-224) gtest/samples/sample7_unittest.cc (+0/-132) gtest/samples/sample8_unittest.cc (+0/-173) gtest/scons/SConscript (+0/-285) gtest/scripts/fuse_gtest_files.py (+0/-250) gtest/scripts/gen_gtest_pred_impl.py (+0/-733) gtest/scripts/gtest-config.in (+0/-274) gtest/scripts/test/Makefile (+0/-57) gtest/src/gtest-all.cc (+0/-41) gtest/src/gtest-death-test.cc (+0/-1177) gtest/src/gtest-filepath.cc (+0/-341) gtest/src/gtest-internal-inl.h (+0/-1417) gtest/src/gtest-port.cc (+0/-672) gtest/src/gtest-test-part.cc (+0/-124) gtest/src/gtest-typed-test.cc (+0/-98) gtest/src/gtest.cc (+0/-4321) gtest/src/gtest_main.cc (+0/-39) gtest/test/gtest-death-test_test.cc (+0/-1133) gtest/test/gtest-filepath_test.cc (+0/-588) gtest/test/gtest-linked_ptr_test.cc (+0/-154) gtest/test/gtest-message_test.cc (+0/-157) gtest/test/gtest-options_test.cc (+0/-267) gtest/test/gtest-param-test2_test.cc (+0/-65) gtest/test/gtest-param-test_test.cc (+0/-792) gtest/test/gtest-param-test_test.h (+0/-55) gtest/test/gtest-port_test.cc (+0/-688) gtest/test/gtest-test-part_test.cc (+0/-138) gtest/test/gtest-tuple_test.cc (+288/-0) gtest/test/gtest-typed-test2_test.cc (+0/-45) gtest/test/gtest-typed-test_test.cc (+0/-362) gtest/test/gtest-typed-test_test.h (+0/-66) gtest/test/gtest-unittest-api_test.cc (+363/-0) gtest/test/gtest_all_test.cc (+0/-47) gtest/test/gtest_break_on_failure_unittest.py (+0/-216) gtest/test/gtest_break_on_failure_unittest_.cc (+0/-66) gtest/test/gtest_color_test.py (+0/-126) gtest/test/gtest_color_test_.cc (+0/-68) gtest/test/gtest_env_var_test.py (+0/-111) gtest/test/gtest_env_var_test_.cc (+0/-126) gtest/test/gtest_environment_test.cc (+0/-186) gtest/test/gtest_filter_unittest.py (+0/-590) gtest/test/gtest_filter_unittest_.cc (+0/-146) gtest/test/gtest_help_test.py (+0/-125) gtest/test/gtest_help_test_.cc (+0/-42) gtest/test/gtest_list_tests_unittest.py (+0/-185) gtest/test/gtest_list_tests_unittest_.cc (+0/-85) gtest/test/gtest_main_unittest.cc (+0/-45) gtest/test/gtest_nc.cc (+0/-234) gtest/test/gtest_nc_test.py (+0/-101) gtest/test/gtest_no_test_unittest.cc (+0/-54) gtest/test/gtest_output_test.py (+0/-282) gtest/test/gtest_output_test_.cc (+0/-1005) gtest/test/gtest_output_test_golden_lin.txt (+0/-632) gtest/test/gtest_output_test_golden_win.txt (+0/-575) gtest/test/gtest_pred_impl_unittest.cc (+0/-2432) gtest/test/gtest_prod_test.cc (+0/-57) gtest/test/gtest_repeat_test.cc (+0/-255) gtest/test/gtest_sole_header_test.cc (+0/-57) gtest/test/gtest_stress_test.cc (+0/-152) gtest/test/gtest_test_utils.py (+0/-226) gtest/test/gtest_throw_on_failure_ex_test.cc (+0/-92) gtest/test/gtest_throw_on_failure_test.py (+0/-172) gtest/test/gtest_throw_on_failure_test_.cc (+0/-56) gtest/test/gtest_uninitialized_test.py (+0/-72) gtest/test/gtest_uninitialized_test_.cc (+0/-43) gtest/test/gtest_unittest.cc (+0/-5665) gtest/test/gtest_xml_outfile1_test_.cc (+0/-49) gtest/test/gtest_xml_outfile2_test_.cc (+0/-49) gtest/test/gtest_xml_outfiles_test.py (+0/-133) gtest/test/gtest_xml_output_unittest.py (+0/-176) gtest/test/gtest_xml_output_unittest_.cc (+0/-120) gtest/test/gtest_xml_test_utils.py (+0/-159) gtest/test/production.cc (+0/-36) gtest/test/production.h (+0/-55) gtest/xcode/Config/DebugProject.xcconfig (+0/-30) gtest/xcode/Config/FrameworkTarget.xcconfig (+0/-17) gtest/xcode/Config/General.xcconfig (+0/-41) gtest/xcode/Config/InternalPythonTestTarget.xcconfig (+0/-8) gtest/xcode/Config/InternalTestTarget.xcconfig (+0/-8) gtest/xcode/Config/ReleaseProject.xcconfig (+0/-32) gtest/xcode/Config/TestTarget.xcconfig (+0/-8) gtest/xcode/Resources/Info.plist (+0/-30) gtest/xcode/Samples/FrameworkSample/Info.plist (+0/-28) gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj (+0/-335) gtest/xcode/Samples/FrameworkSample/widget.cc (+0/-63) gtest/xcode/Samples/FrameworkSample/widget.h (+0/-59) gtest/xcode/Samples/FrameworkSample/widget_test.cc (+0/-68) gtest/xcode/Scripts/runtests.sh (+0/-69) gtest/xcode/Scripts/versiongenerate.py (+0/-71) gtest/xcode/gtest.xcodeproj/project.pbxproj (+0/-4741) java/README.txt (+23/-1) java/pom.xml (+53/-18) java/src/main/java/com/google/protobuf/AbstractMessage.java (+486/-253) java/src/main/java/com/google/protobuf/AbstractMessageLite.java (+321/-0) java/src/main/java/com/google/protobuf/BlockingRpcChannel.java (+0/-51) java/src/main/java/com/google/protobuf/BlockingService.java (+0/-64) java/src/main/java/com/google/protobuf/ByteString.java (+39/-37) java/src/main/java/com/google/protobuf/CodedInputStream.java (+95/-129) java/src/main/java/com/google/protobuf/CodedOutputStream.java (+179/-246) java/src/main/java/com/google/protobuf/Descriptors.java (+331/-252) java/src/main/java/com/google/protobuf/DynamicMessage.java (+52/-29) java/src/main/java/com/google/protobuf/ExtensionRegistry.java (+45/-35) java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java (+169/-0) java/src/main/java/com/google/protobuf/FieldSet.java (+512/-524) java/src/main/java/com/google/protobuf/GeneratedMessage.java (+284/-248) java/src/main/java/com/google/protobuf/GeneratedMessageLite.java (+539/-0) java/src/main/java/com/google/protobuf/Internal.java (+121/-0) java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java (+3/-1) java/src/main/java/com/google/protobuf/Message.java (+32/-217) java/src/main/java/com/google/protobuf/MessageLite.java (+331/-0) java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java (+0/-58) java/src/main/java/com/google/protobuf/RpcUtil.java (+8/-5) java/src/main/java/com/google/protobuf/ServiceException.java (+0/-42) java/src/main/java/com/google/protobuf/TextFormat.java (+165/-133) java/src/main/java/com/google/protobuf/UninitializedMessageException.java (+12/-73) java/src/main/java/com/google/protobuf/UnknownFieldSet.java (+257/-115) java/src/main/java/com/google/protobuf/WireFormat.java (+64/-34) java/src/test/java/com/google/protobuf/DescriptorsTest.java (+38/-0) java/src/test/java/com/google/protobuf/DynamicMessageTest.java (+12/-0) java/src/test/java/com/google/protobuf/GeneratedMessageTest.java (+89/-0) java/src/test/java/com/google/protobuf/LiteTest.java (+114/-0) java/src/test/java/com/google/protobuf/TestUtil.java (+945/-86) java/src/test/java/com/google/protobuf/TextFormatTest.java (+22/-3) java/src/test/java/com/google/protobuf/WireFormatTest.java (+65/-0) m4/acx_check_suncc.m4 (+0/-33) protobuf-lite.pc.in (+13/-0) protobuf.pc.in (+13/-0) python/google/protobuf/internal/containers.py (+6/-2) python/google/protobuf/internal/decoder.py (+2/-2) python/google/protobuf/internal/decoder_test.py (+11/-7) python/google/protobuf/internal/encoder.py (+4/-2) python/google/protobuf/internal/encoder_test.py (+8/-4) python/google/protobuf/internal/message_test.py (+53/-0) python/google/protobuf/internal/reflection_test.py (+84/-4) python/google/protobuf/internal/test_util.py (+197/-1) python/google/protobuf/internal/text_format_test.py (+278/-3) python/google/protobuf/internal/type_checkers.py (+4/-2) python/google/protobuf/internal/wire_format.py (+2/-0) python/google/protobuf/message.py (+1/-2) python/google/protobuf/reflection.py (+56/-10) python/google/protobuf/service.py (+3/-2) python/google/protobuf/text_format.py (+526/-1) python/setup.py (+1/-1) src/Makefile.am (+52/-17) src/Makefile.in (+407/-139) src/google/protobuf/compiler/code_generator.cc (+22/-0) src/google/protobuf/compiler/code_generator.h (+11/-0) src/google/protobuf/compiler/cpp/cpp_enum.cc (+51/-28) src/google/protobuf/compiler/cpp/cpp_enum.h (+4/-0) src/google/protobuf/compiler/cpp/cpp_enum_field.cc (+52/-55) src/google/protobuf/compiler/cpp/cpp_extension.cc (+1/-0) src/google/protobuf/compiler/cpp/cpp_field.cc (+19/-0) src/google/protobuf/compiler/cpp/cpp_field.h (+10/-0) src/google/protobuf/compiler/cpp/cpp_file.cc (+196/-145) src/google/protobuf/compiler/cpp/cpp_generator.cc (+1/-28) src/google/protobuf/compiler/cpp/cpp_helpers.cc (+21/-2) src/google/protobuf/compiler/cpp/cpp_helpers.h (+29/-0) src/google/protobuf/compiler/cpp/cpp_message.cc (+361/-209) src/google/protobuf/compiler/cpp/cpp_message.h (+4/-5) src/google/protobuf/compiler/cpp/cpp_message_field.cc (+29/-38) src/google/protobuf/compiler/cpp/cpp_primitive_field.cc (+49/-60) src/google/protobuf/compiler/cpp/cpp_service.cc (+1/-1) src/google/protobuf/compiler/cpp/cpp_string_field.cc (+84/-45) src/google/protobuf/compiler/cpp/cpp_unittest.cc (+54/-6) src/google/protobuf/compiler/java/java_enum.cc (+88/-68) src/google/protobuf/compiler/java/java_enum_field.cc (+26/-17) src/google/protobuf/compiler/java/java_extension.cc (+85/-14) src/google/protobuf/compiler/java/java_file.cc (+50/-9) src/google/protobuf/compiler/java/java_file.h (+2/-0) src/google/protobuf/compiler/java/java_generator.cc (+1/-27) src/google/protobuf/compiler/java/java_helpers.cc (+67/-0) src/google/protobuf/compiler/java/java_helpers.h (+30/-0) src/google/protobuf/compiler/java/java_message.cc (+290/-191) src/google/protobuf/compiler/java/java_primitive_field.cc (+21/-80) src/google/protobuf/compiler/parser.cc (+1/-1) src/google/protobuf/descriptor.cc (+65/-13) src/google/protobuf/descriptor.pb.cc (+1224/-843) src/google/protobuf/descriptor.pb.h (+127/-74) src/google/protobuf/descriptor.proto (+9/-2) src/google/protobuf/descriptor_unittest.cc (+145/-0) src/google/protobuf/dynamic_message.cc (+43/-41) src/google/protobuf/extension_set.cc (+509/-281) src/google/protobuf/extension_set.h (+110/-47) src/google/protobuf/extension_set_heavy.cc (+221/-0) src/google/protobuf/generated_message_reflection.cc (+317/-47) src/google/protobuf/generated_message_reflection.h (+17/-14) src/google/protobuf/generated_message_reflection_unittest.cc (+116/-0) src/google/protobuf/generated_message_util.cc (+44/-0) src/google/protobuf/generated_message_util.h (+65/-0) src/google/protobuf/io/coded_stream.cc (+46/-50) src/google/protobuf/io/coded_stream.h (+46/-0) src/google/protobuf/io/gzip_stream.cc (+0/-296) src/google/protobuf/io/gzip_stream.h (+0/-178) src/google/protobuf/io/gzip_stream_unittest.sh (+0/-44) src/google/protobuf/io/tokenizer.cc (+1/-1) src/google/protobuf/io/tokenizer_unittest.cc (+1/-0) src/google/protobuf/io/zero_copy_stream_impl.cc (+0/-345) src/google/protobuf/io/zero_copy_stream_impl.h (+4/-284) src/google/protobuf/io/zero_copy_stream_impl_lite.cc (+393/-0) src/google/protobuf/io/zero_copy_stream_impl_lite.h (+340/-0) src/google/protobuf/io/zero_copy_stream_unittest.cc (+66/-0) src/google/protobuf/lite_unittest.cc (+112/-0) src/google/protobuf/message.cc (+27/-177) src/google/protobuf/message.h (+87/-157) src/google/protobuf/message_lite.cc (+293/-0) src/google/protobuf/message_lite.h (+239/-0) src/google/protobuf/message_unittest.cc (+0/-30) src/google/protobuf/repeated_field.cc (+38/-17) src/google/protobuf/repeated_field.h (+432/-353) src/google/protobuf/stubs/common.cc (+38/-15) src/google/protobuf/stubs/common.h (+26/-18) src/google/protobuf/stubs/map-util.cc (+0/-42) src/google/protobuf/stubs/once.cc (+0/-82) src/google/protobuf/stubs/once.h (+0/-122) src/google/protobuf/stubs/once_unittest.cc (+0/-253) src/google/protobuf/stubs/stl_util-inl.cc (+0/-41) src/google/protobuf/test_util.cc (+321/-6) src/google/protobuf/test_util.h (+15/-0) src/google/protobuf/test_util_lite.cc (+1502/-0) src/google/protobuf/test_util_lite.h (+101/-0) src/google/protobuf/testing/zcgunzip.cc (+0/-73) src/google/protobuf/testing/zcgzip.cc (+0/-79) src/google/protobuf/text_format.cc (+48/-16) src/google/protobuf/text_format.h (+12/-0) src/google/protobuf/text_format_unittest.cc (+117/-3) src/google/protobuf/unittest.proto (+10/-0) src/google/protobuf/unittest_custom_options.proto (+2/-0) src/google/protobuf/unittest_empty.proto (+0/-37) src/google/protobuf/unittest_enormous_descriptor.proto (+1045/-0) src/google/protobuf/unittest_import_lite.proto (+49/-0) src/google/protobuf/unittest_lite.proto (+312/-0) src/google/protobuf/unittest_lite_imports_nonlite.proto (+43/-0) src/google/protobuf/wire_format.cc (+161/-145) src/google/protobuf/wire_format.h (+96/-366) src/google/protobuf/wire_format_inl.h (+0/-687) src/google/protobuf/wire_format_lite.cc (+192/-0) src/google/protobuf/wire_format_lite.h (+558/-0) src/google/protobuf/wire_format_lite_inl.h (+657/-0) src/google/protobuf/wire_format_unittest.cc (+51/-12) vsprojects/extract_includes.bat (+5/-1) vsprojects/libprotobuf-lite.vcproj (+270/-0) vsprojects/libprotobuf.vcproj (+37/-9) vsprojects/lite-test.vcproj (+273/-0) vsprojects/protobuf.sln (+16/-0) vsprojects/readme.txt (+6/-3) vsprojects/tests.vcproj (+32/-0) |
To merge this branch: | bzr merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Registry Administrators | Pending | ||
Review via email: mp+17571@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote : | # |
Revision history for this message
Daniel Holbach (dholbach) wrote : | # |
As far as I can tell this has been merged into Lucid already.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'CHANGES.txt' | |||
2 | --- CHANGES.txt 2009-06-24 00:19:03 +0000 | |||
3 | +++ CHANGES.txt 2010-01-18 04:34:17 +0000 | |||
4 | @@ -1,4 +1,50 @@ | |||
6 | 1 | ????-??-?? version 2.1.0: | 1 | 2009-11-18 version 2.2.0a: |
7 | 2 | |||
8 | 3 | There is probably no reason to install this release if you have arleady | ||
9 | 4 | installed 2.2.0. | ||
10 | 5 | |||
11 | 6 | C++ | ||
12 | 7 | * Bumped binary interface version number, so that installing libprotobuf.so | ||
13 | 8 | v2.2.0 doesn't break already-compiled binaries that are linked against | ||
14 | 9 | v2.1.0. This should have happened as part of the original 2.2.0 release, | ||
15 | 10 | but somehow was missed. | ||
16 | 11 | |||
17 | 12 | 2009-08-11 version 2.2.0: | ||
18 | 13 | |||
19 | 14 | C++ | ||
20 | 15 | * Lite mode: The "optimize_for = LITE_RUNTIME" option causes the compiler | ||
21 | 16 | to generate code which only depends libprotobuf-lite, which is much smaller | ||
22 | 17 | than libprotobuf but lacks descriptors, reflection, and some other features. | ||
23 | 18 | * Fixed bug where Message.Swap(Message) was only implemented for | ||
24 | 19 | optimize_for_speed. Swap now properly implemented in both modes | ||
25 | 20 | (Issue 91). | ||
26 | 21 | * Added RemoveLast and SwapElements(index1, index2) to Reflection | ||
27 | 22 | interface for repeated elements. | ||
28 | 23 | * Added Swap(Message) to Reflection interface. | ||
29 | 24 | * Floating-point literals in generated code that are intended to be | ||
30 | 25 | single-precision now explicitly have 'f' suffix to avoid pedantic warnings | ||
31 | 26 | produced by some compilers. | ||
32 | 27 | * The [deprecated=true] option now causes the C++ code generator to generate | ||
33 | 28 | a GCC-style deprecation annotation (no-op on other compilers). | ||
34 | 29 | * google::protobuf::GetEnumDescriptor<SomeGeneratedEnumType>() returns the | ||
35 | 30 | EnumDescriptor for that type -- useful for templates which cannot call | ||
36 | 31 | SomeGeneratedEnumType_descriptor(). | ||
37 | 32 | * Various optimizations and obscure bug fixes. | ||
38 | 33 | |||
39 | 34 | Java | ||
40 | 35 | * Lite mode: The "optimize_for = LITE_RUNTIME" option causes the compiler | ||
41 | 36 | to generate code which only depends libprotobuf-lite, which is much smaller | ||
42 | 37 | than libprotobuf but lacks descriptors, reflection, and some other features. | ||
43 | 38 | * Lots of style cleanups. | ||
44 | 39 | |||
45 | 40 | Python | ||
46 | 41 | * Fixed endianness bug with floats and doubles. | ||
47 | 42 | * Text format parsing support. | ||
48 | 43 | * Fix bug with parsing packed repeated fields in embedded messages. | ||
49 | 44 | * Ability to initialize fields by passing keyword args to constructor. | ||
50 | 45 | * Support iterators in extend and __setslice__ for containers. | ||
51 | 46 | |||
52 | 47 | 2009-05-13 version 2.1.0: | ||
53 | 2 | 48 | ||
54 | 3 | General | 49 | General |
55 | 4 | * Repeated fields of primitive types (types other that string, group, and | 50 | * Repeated fields of primitive types (types other that string, group, and |
56 | 5 | 51 | ||
57 | === modified file 'CONTRIBUTORS.txt' | |||
58 | --- CONTRIBUTORS.txt 2009-06-24 00:19:03 +0000 | |||
59 | +++ CONTRIBUTORS.txt 2010-01-18 04:34:16 +0000 | |||
60 | @@ -70,3 +70,5 @@ | |||
61 | 70 | * Small patch improving performance of in Python serialization. | 70 | * Small patch improving performance of in Python serialization. |
62 | 71 | Alexandre Vassalotti <alexandre@peadrop.com> | 71 | Alexandre Vassalotti <alexandre@peadrop.com> |
63 | 72 | * Emacs mode for Protocol Buffers (editors/protobuf-mode.el). | 72 | * Emacs mode for Protocol Buffers (editors/protobuf-mode.el). |
64 | 73 | Scott Stafford <scott.stafford@gmail.com> | ||
65 | 74 | * Added Swap(), SwapElements(), and RemoveLast() to Reflection interface. | ||
66 | 73 | 75 | ||
67 | === modified file 'Makefile.am' | |||
68 | --- Makefile.am 2009-06-24 00:19:03 +0000 | |||
69 | +++ Makefile.am 2010-01-18 04:34:16 +0000 | |||
70 | @@ -32,6 +32,9 @@ | |||
71 | 32 | cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \ | 32 | cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \ |
72 | 33 | fi | 33 | fi |
73 | 34 | 34 | ||
74 | 35 | pkgconfigdir = $(libdir)/pkgconfig | ||
75 | 36 | pkgconfig_DATA = protobuf.pc protobuf-lite.pc | ||
76 | 37 | |||
77 | 35 | EXTRA_DIST = \ | 38 | EXTRA_DIST = \ |
78 | 36 | autogen.sh \ | 39 | autogen.sh \ |
79 | 37 | generate_descriptor_proto.sh \ | 40 | generate_descriptor_proto.sh \ |
80 | @@ -46,11 +49,13 @@ | |||
81 | 46 | vsprojects/config.h \ | 49 | vsprojects/config.h \ |
82 | 47 | vsprojects/extract_includes.bat \ | 50 | vsprojects/extract_includes.bat \ |
83 | 48 | vsprojects/libprotobuf.vcproj \ | 51 | vsprojects/libprotobuf.vcproj \ |
84 | 52 | vsprojects/libprotobuf-lite.vcproj \ | ||
85 | 49 | vsprojects/libprotoc.vcproj \ | 53 | vsprojects/libprotoc.vcproj \ |
86 | 50 | vsprojects/protobuf.sln \ | 54 | vsprojects/protobuf.sln \ |
87 | 51 | vsprojects/protoc.vcproj \ | 55 | vsprojects/protoc.vcproj \ |
88 | 52 | vsprojects/readme.txt \ | 56 | vsprojects/readme.txt \ |
89 | 53 | vsprojects/tests.vcproj \ | 57 | vsprojects/tests.vcproj \ |
90 | 58 | vsprojects/lite-test.vcproj \ | ||
91 | 54 | vsprojects/convert2008to2005.sh \ | 59 | vsprojects/convert2008to2005.sh \ |
92 | 55 | examples/README.txt \ | 60 | examples/README.txt \ |
93 | 56 | examples/Makefile \ | 61 | examples/Makefile \ |
94 | @@ -62,6 +67,7 @@ | |||
95 | 62 | examples/add_person.py \ | 67 | examples/add_person.py \ |
96 | 63 | examples/list_people.py \ | 68 | examples/list_people.py \ |
97 | 64 | java/src/main/java/com/google/protobuf/AbstractMessage.java \ | 69 | java/src/main/java/com/google/protobuf/AbstractMessage.java \ |
98 | 70 | java/src/main/java/com/google/protobuf/AbstractMessageLite.java \ | ||
99 | 65 | java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \ | 71 | java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \ |
100 | 66 | java/src/main/java/com/google/protobuf/BlockingService.java \ | 72 | java/src/main/java/com/google/protobuf/BlockingService.java \ |
101 | 67 | java/src/main/java/com/google/protobuf/ByteString.java \ | 73 | java/src/main/java/com/google/protobuf/ByteString.java \ |
102 | @@ -70,10 +76,14 @@ | |||
103 | 70 | java/src/main/java/com/google/protobuf/Descriptors.java \ | 76 | java/src/main/java/com/google/protobuf/Descriptors.java \ |
104 | 71 | java/src/main/java/com/google/protobuf/DynamicMessage.java \ | 77 | java/src/main/java/com/google/protobuf/DynamicMessage.java \ |
105 | 72 | java/src/main/java/com/google/protobuf/ExtensionRegistry.java \ | 78 | java/src/main/java/com/google/protobuf/ExtensionRegistry.java \ |
106 | 79 | java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java \ | ||
107 | 73 | java/src/main/java/com/google/protobuf/FieldSet.java \ | 80 | java/src/main/java/com/google/protobuf/FieldSet.java \ |
108 | 74 | java/src/main/java/com/google/protobuf/GeneratedMessage.java \ | 81 | java/src/main/java/com/google/protobuf/GeneratedMessage.java \ |
109 | 82 | java/src/main/java/com/google/protobuf/GeneratedMessageLite.java \ | ||
110 | 83 | java/src/main/java/com/google/protobuf/Internal.java \ | ||
111 | 75 | java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \ | 84 | java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \ |
112 | 76 | java/src/main/java/com/google/protobuf/Message.java \ | 85 | java/src/main/java/com/google/protobuf/Message.java \ |
113 | 86 | java/src/main/java/com/google/protobuf/MessageLite.java \ | ||
114 | 77 | java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \ | 87 | java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \ |
115 | 78 | java/src/main/java/com/google/protobuf/RpcCallback.java \ | 88 | java/src/main/java/com/google/protobuf/RpcCallback.java \ |
116 | 79 | java/src/main/java/com/google/protobuf/RpcChannel.java \ | 89 | java/src/main/java/com/google/protobuf/RpcChannel.java \ |
117 | @@ -91,6 +101,7 @@ | |||
118 | 91 | java/src/test/java/com/google/protobuf/DescriptorsTest.java \ | 101 | java/src/test/java/com/google/protobuf/DescriptorsTest.java \ |
119 | 92 | java/src/test/java/com/google/protobuf/DynamicMessageTest.java \ | 102 | java/src/test/java/com/google/protobuf/DynamicMessageTest.java \ |
120 | 93 | java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \ | 103 | java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \ |
121 | 104 | java/src/test/java/com/google/protobuf/LiteTest.java \ | ||
122 | 94 | java/src/test/java/com/google/protobuf/MessageTest.java \ | 105 | java/src/test/java/com/google/protobuf/MessageTest.java \ |
123 | 95 | java/src/test/java/com/google/protobuf/ServiceTest.java \ | 106 | java/src/test/java/com/google/protobuf/ServiceTest.java \ |
124 | 96 | java/src/test/java/com/google/protobuf/TestUtil.java \ | 107 | java/src/test/java/com/google/protobuf/TestUtil.java \ |
125 | @@ -110,6 +121,7 @@ | |||
126 | 110 | python/google/protobuf/internal/input_stream.py \ | 121 | python/google/protobuf/internal/input_stream.py \ |
127 | 111 | python/google/protobuf/internal/input_stream_test.py \ | 122 | python/google/protobuf/internal/input_stream_test.py \ |
128 | 112 | python/google/protobuf/internal/message_listener.py \ | 123 | python/google/protobuf/internal/message_listener.py \ |
129 | 124 | python/google/protobuf/internal/message_test.py \ | ||
130 | 113 | python/google/protobuf/internal/more_extensions.proto \ | 125 | python/google/protobuf/internal/more_extensions.proto \ |
131 | 114 | python/google/protobuf/internal/more_messages.proto \ | 126 | python/google/protobuf/internal/more_messages.proto \ |
132 | 115 | python/google/protobuf/internal/output_stream.py \ | 127 | python/google/protobuf/internal/output_stream.py \ |
133 | @@ -149,4 +161,9 @@ | |||
134 | 149 | missing \ | 161 | missing \ |
135 | 150 | mkinstalldirs \ | 162 | mkinstalldirs \ |
136 | 151 | config.h.in \ | 163 | config.h.in \ |
138 | 152 | stamp.h.in | 164 | stamp.h.in \ |
139 | 165 | m4/ltsugar.m4 \ | ||
140 | 166 | m4/libtool.m4 \ | ||
141 | 167 | m4/ltversion.m4 \ | ||
142 | 168 | m4/lt~obsolete.m4 \ | ||
143 | 169 | m4/ltoptions.m4 | ||
144 | 153 | 170 | ||
145 | === modified file 'Makefile.in' | |||
146 | --- Makefile.in 2009-06-24 00:19:03 +0000 | |||
147 | +++ Makefile.in 2010-01-18 04:34:16 +0000 | |||
148 | @@ -13,6 +13,7 @@ | |||
149 | 13 | # PARTICULAR PURPOSE. | 13 | # PARTICULAR PURPOSE. |
150 | 14 | 14 | ||
151 | 15 | @SET_MAKE@ | 15 | @SET_MAKE@ |
152 | 16 | |||
153 | 16 | VPATH = @srcdir@ | 17 | VPATH = @srcdir@ |
154 | 17 | pkgdatadir = $(datadir)/@PACKAGE@ | 18 | pkgdatadir = $(datadir)/@PACKAGE@ |
155 | 18 | pkglibdir = $(libdir)/@PACKAGE@ | 19 | pkglibdir = $(libdir)/@PACKAGE@ |
156 | @@ -31,9 +32,11 @@ | |||
157 | 31 | POST_UNINSTALL = : | 32 | POST_UNINSTALL = : |
158 | 32 | build_triplet = @build@ | 33 | build_triplet = @build@ |
159 | 33 | host_triplet = @host@ | 34 | host_triplet = @host@ |
160 | 35 | target_triplet = @target@ | ||
161 | 34 | subdir = . | 36 | subdir = . |
162 | 35 | DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ | 37 | DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ |
163 | 36 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | 38 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
164 | 39 | $(srcdir)/protobuf-lite.pc.in $(srcdir)/protobuf.pc.in \ | ||
165 | 37 | $(top_srcdir)/configure config.guess config.sub depcomp \ | 40 | $(top_srcdir)/configure config.guess config.sub depcomp \ |
166 | 38 | install-sh ltmain.sh missing | 41 | install-sh ltmain.sh missing |
167 | 39 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 42 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
168 | @@ -49,7 +52,7 @@ | |||
169 | 49 | configure.lineno config.status.lineno | 52 | configure.lineno config.status.lineno |
170 | 50 | mkinstalldirs = $(install_sh) -d | 53 | mkinstalldirs = $(install_sh) -d |
171 | 51 | CONFIG_HEADER = config.h | 54 | CONFIG_HEADER = config.h |
173 | 52 | CONFIG_CLEAN_FILES = | 55 | CONFIG_CLEAN_FILES = protobuf.pc protobuf-lite.pc |
174 | 53 | SOURCES = | 56 | SOURCES = |
175 | 54 | DIST_SOURCES = | 57 | DIST_SOURCES = |
176 | 55 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ | 58 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
177 | @@ -59,6 +62,15 @@ | |||
178 | 59 | install-pdf-recursive install-ps-recursive install-recursive \ | 62 | install-pdf-recursive install-ps-recursive install-recursive \ |
179 | 60 | installcheck-recursive installdirs-recursive pdf-recursive \ | 63 | installcheck-recursive installdirs-recursive pdf-recursive \ |
180 | 61 | ps-recursive uninstall-recursive | 64 | ps-recursive uninstall-recursive |
181 | 65 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
182 | 66 | am__vpath_adj = case $$p in \ | ||
183 | 67 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
184 | 68 | *) f=$$p;; \ | ||
185 | 69 | esac; | ||
186 | 70 | am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | ||
187 | 71 | am__installdirs = "$(DESTDIR)$(pkgconfigdir)" | ||
188 | 72 | pkgconfigDATA_INSTALL = $(INSTALL_DATA) | ||
189 | 73 | DATA = $(pkgconfig_DATA) | ||
190 | 62 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | 74 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
191 | 63 | distclean-recursive maintainer-clean-recursive | 75 | distclean-recursive maintainer-clean-recursive |
192 | 64 | ETAGS = etags | 76 | ETAGS = etags |
193 | @@ -106,6 +118,7 @@ | |||
194 | 106 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | 118 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
195 | 107 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | 119 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
196 | 108 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | 120 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
197 | 121 | ISAINFO = @ISAINFO@ | ||
198 | 109 | LD = @LD@ | 122 | LD = @LD@ |
199 | 110 | LDFLAGS = @LDFLAGS@ | 123 | LDFLAGS = @LDFLAGS@ |
200 | 111 | LIBOBJS = @LIBOBJS@ | 124 | LIBOBJS = @LIBOBJS@ |
201 | @@ -191,7 +204,11 @@ | |||
202 | 191 | srcdir = @srcdir@ | 204 | srcdir = @srcdir@ |
203 | 192 | subdirs = @subdirs@ | 205 | subdirs = @subdirs@ |
204 | 193 | sysconfdir = @sysconfdir@ | 206 | sysconfdir = @sysconfdir@ |
205 | 207 | target = @target@ | ||
206 | 194 | target_alias = @target_alias@ | 208 | target_alias = @target_alias@ |
207 | 209 | target_cpu = @target_cpu@ | ||
208 | 210 | target_os = @target_os@ | ||
209 | 211 | target_vendor = @target_vendor@ | ||
210 | 195 | top_builddir = @top_builddir@ | 212 | top_builddir = @top_builddir@ |
211 | 196 | top_srcdir = @top_srcdir@ | 213 | top_srcdir = @top_srcdir@ |
212 | 197 | ACLOCAL_AMFLAGS = -I m4 | 214 | ACLOCAL_AMFLAGS = -I m4 |
213 | @@ -203,6 +220,8 @@ | |||
214 | 203 | 220 | ||
215 | 204 | # Always include gtest in distributions. | 221 | # Always include gtest in distributions. |
216 | 205 | DIST_SUBDIRS = $(subdirs) src | 222 | DIST_SUBDIRS = $(subdirs) src |
217 | 223 | pkgconfigdir = $(libdir)/pkgconfig | ||
218 | 224 | pkgconfig_DATA = protobuf.pc protobuf-lite.pc | ||
219 | 206 | EXTRA_DIST = \ | 225 | EXTRA_DIST = \ |
220 | 207 | autogen.sh \ | 226 | autogen.sh \ |
221 | 208 | generate_descriptor_proto.sh \ | 227 | generate_descriptor_proto.sh \ |
222 | @@ -217,11 +236,13 @@ | |||
223 | 217 | vsprojects/config.h \ | 236 | vsprojects/config.h \ |
224 | 218 | vsprojects/extract_includes.bat \ | 237 | vsprojects/extract_includes.bat \ |
225 | 219 | vsprojects/libprotobuf.vcproj \ | 238 | vsprojects/libprotobuf.vcproj \ |
226 | 239 | vsprojects/libprotobuf-lite.vcproj \ | ||
227 | 220 | vsprojects/libprotoc.vcproj \ | 240 | vsprojects/libprotoc.vcproj \ |
228 | 221 | vsprojects/protobuf.sln \ | 241 | vsprojects/protobuf.sln \ |
229 | 222 | vsprojects/protoc.vcproj \ | 242 | vsprojects/protoc.vcproj \ |
230 | 223 | vsprojects/readme.txt \ | 243 | vsprojects/readme.txt \ |
231 | 224 | vsprojects/tests.vcproj \ | 244 | vsprojects/tests.vcproj \ |
232 | 245 | vsprojects/lite-test.vcproj \ | ||
233 | 225 | vsprojects/convert2008to2005.sh \ | 246 | vsprojects/convert2008to2005.sh \ |
234 | 226 | examples/README.txt \ | 247 | examples/README.txt \ |
235 | 227 | examples/Makefile \ | 248 | examples/Makefile \ |
236 | @@ -233,6 +254,7 @@ | |||
237 | 233 | examples/add_person.py \ | 254 | examples/add_person.py \ |
238 | 234 | examples/list_people.py \ | 255 | examples/list_people.py \ |
239 | 235 | java/src/main/java/com/google/protobuf/AbstractMessage.java \ | 256 | java/src/main/java/com/google/protobuf/AbstractMessage.java \ |
240 | 257 | java/src/main/java/com/google/protobuf/AbstractMessageLite.java \ | ||
241 | 236 | java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \ | 258 | java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \ |
242 | 237 | java/src/main/java/com/google/protobuf/BlockingService.java \ | 259 | java/src/main/java/com/google/protobuf/BlockingService.java \ |
243 | 238 | java/src/main/java/com/google/protobuf/ByteString.java \ | 260 | java/src/main/java/com/google/protobuf/ByteString.java \ |
244 | @@ -241,10 +263,14 @@ | |||
245 | 241 | java/src/main/java/com/google/protobuf/Descriptors.java \ | 263 | java/src/main/java/com/google/protobuf/Descriptors.java \ |
246 | 242 | java/src/main/java/com/google/protobuf/DynamicMessage.java \ | 264 | java/src/main/java/com/google/protobuf/DynamicMessage.java \ |
247 | 243 | java/src/main/java/com/google/protobuf/ExtensionRegistry.java \ | 265 | java/src/main/java/com/google/protobuf/ExtensionRegistry.java \ |
248 | 266 | java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java \ | ||
249 | 244 | java/src/main/java/com/google/protobuf/FieldSet.java \ | 267 | java/src/main/java/com/google/protobuf/FieldSet.java \ |
250 | 245 | java/src/main/java/com/google/protobuf/GeneratedMessage.java \ | 268 | java/src/main/java/com/google/protobuf/GeneratedMessage.java \ |
251 | 269 | java/src/main/java/com/google/protobuf/GeneratedMessageLite.java \ | ||
252 | 270 | java/src/main/java/com/google/protobuf/Internal.java \ | ||
253 | 246 | java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \ | 271 | java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \ |
254 | 247 | java/src/main/java/com/google/protobuf/Message.java \ | 272 | java/src/main/java/com/google/protobuf/Message.java \ |
255 | 273 | java/src/main/java/com/google/protobuf/MessageLite.java \ | ||
256 | 248 | java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \ | 274 | java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \ |
257 | 249 | java/src/main/java/com/google/protobuf/RpcCallback.java \ | 275 | java/src/main/java/com/google/protobuf/RpcCallback.java \ |
258 | 250 | java/src/main/java/com/google/protobuf/RpcChannel.java \ | 276 | java/src/main/java/com/google/protobuf/RpcChannel.java \ |
259 | @@ -262,6 +288,7 @@ | |||
260 | 262 | java/src/test/java/com/google/protobuf/DescriptorsTest.java \ | 288 | java/src/test/java/com/google/protobuf/DescriptorsTest.java \ |
261 | 263 | java/src/test/java/com/google/protobuf/DynamicMessageTest.java \ | 289 | java/src/test/java/com/google/protobuf/DynamicMessageTest.java \ |
262 | 264 | java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \ | 290 | java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \ |
263 | 291 | java/src/test/java/com/google/protobuf/LiteTest.java \ | ||
264 | 265 | java/src/test/java/com/google/protobuf/MessageTest.java \ | 292 | java/src/test/java/com/google/protobuf/MessageTest.java \ |
265 | 266 | java/src/test/java/com/google/protobuf/ServiceTest.java \ | 293 | java/src/test/java/com/google/protobuf/ServiceTest.java \ |
266 | 267 | java/src/test/java/com/google/protobuf/TestUtil.java \ | 294 | java/src/test/java/com/google/protobuf/TestUtil.java \ |
267 | @@ -281,6 +308,7 @@ | |||
268 | 281 | python/google/protobuf/internal/input_stream.py \ | 308 | python/google/protobuf/internal/input_stream.py \ |
269 | 282 | python/google/protobuf/internal/input_stream_test.py \ | 309 | python/google/protobuf/internal/input_stream_test.py \ |
270 | 283 | python/google/protobuf/internal/message_listener.py \ | 310 | python/google/protobuf/internal/message_listener.py \ |
271 | 311 | python/google/protobuf/internal/message_test.py \ | ||
272 | 284 | python/google/protobuf/internal/more_extensions.proto \ | 312 | python/google/protobuf/internal/more_extensions.proto \ |
273 | 285 | python/google/protobuf/internal/more_messages.proto \ | 313 | python/google/protobuf/internal/more_messages.proto \ |
274 | 286 | python/google/protobuf/internal/output_stream.py \ | 314 | python/google/protobuf/internal/output_stream.py \ |
275 | @@ -321,7 +349,12 @@ | |||
276 | 321 | missing \ | 349 | missing \ |
277 | 322 | mkinstalldirs \ | 350 | mkinstalldirs \ |
278 | 323 | config.h.in \ | 351 | config.h.in \ |
280 | 324 | stamp.h.in | 352 | stamp.h.in \ |
281 | 353 | m4/ltsugar.m4 \ | ||
282 | 354 | m4/libtool.m4 \ | ||
283 | 355 | m4/ltversion.m4 \ | ||
284 | 356 | m4/lt~obsolete.m4 \ | ||
285 | 357 | m4/ltoptions.m4 | ||
286 | 325 | 358 | ||
287 | 326 | all: config.h | 359 | all: config.h |
288 | 327 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | 360 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
289 | @@ -377,6 +410,10 @@ | |||
290 | 377 | 410 | ||
291 | 378 | distclean-hdr: | 411 | distclean-hdr: |
292 | 379 | -rm -f config.h stamp-h1 | 412 | -rm -f config.h stamp-h1 |
293 | 413 | protobuf.pc: $(top_builddir)/config.status $(srcdir)/protobuf.pc.in | ||
294 | 414 | cd $(top_builddir) && $(SHELL) ./config.status $@ | ||
295 | 415 | protobuf-lite.pc: $(top_builddir)/config.status $(srcdir)/protobuf-lite.pc.in | ||
296 | 416 | cd $(top_builddir) && $(SHELL) ./config.status $@ | ||
297 | 380 | 417 | ||
298 | 381 | mostlyclean-libtool: | 418 | mostlyclean-libtool: |
299 | 382 | -rm -f *.lo | 419 | -rm -f *.lo |
300 | @@ -386,6 +423,23 @@ | |||
301 | 386 | 423 | ||
302 | 387 | distclean-libtool: | 424 | distclean-libtool: |
303 | 388 | -rm -f libtool | 425 | -rm -f libtool |
304 | 426 | install-pkgconfigDATA: $(pkgconfig_DATA) | ||
305 | 427 | @$(NORMAL_INSTALL) | ||
306 | 428 | test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" | ||
307 | 429 | @list='$(pkgconfig_DATA)'; for p in $$list; do \ | ||
308 | 430 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
309 | 431 | f=$(am__strip_dir) \ | ||
310 | 432 | echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ | ||
311 | 433 | $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ | ||
312 | 434 | done | ||
313 | 435 | |||
314 | 436 | uninstall-pkgconfigDATA: | ||
315 | 437 | @$(NORMAL_UNINSTALL) | ||
316 | 438 | @list='$(pkgconfig_DATA)'; for p in $$list; do \ | ||
317 | 439 | f=$(am__strip_dir) \ | ||
318 | 440 | echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ | ||
319 | 441 | rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ | ||
320 | 442 | done | ||
321 | 389 | 443 | ||
322 | 390 | # This directory's subdirectories are mostly independent; you can cd | 444 | # This directory's subdirectories are mostly independent; you can cd |
323 | 391 | # into them and run `make' without going through this Makefile. | 445 | # into them and run `make' without going through this Makefile. |
324 | @@ -668,9 +722,12 @@ | |||
325 | 668 | check-am: all-am | 722 | check-am: all-am |
326 | 669 | $(MAKE) $(AM_MAKEFLAGS) check-local | 723 | $(MAKE) $(AM_MAKEFLAGS) check-local |
327 | 670 | check: check-recursive | 724 | check: check-recursive |
329 | 671 | all-am: Makefile config.h | 725 | all-am: Makefile $(DATA) config.h |
330 | 672 | installdirs: installdirs-recursive | 726 | installdirs: installdirs-recursive |
331 | 673 | installdirs-am: | 727 | installdirs-am: |
332 | 728 | for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ | ||
333 | 729 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | ||
334 | 730 | done | ||
335 | 674 | install: install-recursive | 731 | install: install-recursive |
336 | 675 | install-exec: install-exec-recursive | 732 | install-exec: install-exec-recursive |
337 | 676 | install-data: install-data-recursive | 733 | install-data: install-data-recursive |
338 | @@ -716,7 +773,7 @@ | |||
339 | 716 | 773 | ||
340 | 717 | info-am: | 774 | info-am: |
341 | 718 | 775 | ||
343 | 719 | install-data-am: | 776 | install-data-am: install-pkgconfigDATA |
344 | 720 | 777 | ||
345 | 721 | install-dvi: install-dvi-recursive | 778 | install-dvi: install-dvi-recursive |
346 | 722 | 779 | ||
347 | @@ -752,7 +809,7 @@ | |||
348 | 752 | 809 | ||
349 | 753 | ps-am: | 810 | ps-am: |
350 | 754 | 811 | ||
352 | 755 | uninstall-am: | 812 | uninstall-am: uninstall-pkgconfigDATA |
353 | 756 | 813 | ||
354 | 757 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | 814 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ |
355 | 758 | install-strip | 815 | install-strip |
356 | @@ -767,12 +824,12 @@ | |||
357 | 767 | info-am install install-am install-data install-data-am \ | 824 | info-am install install-am install-data install-data-am \ |
358 | 768 | install-dvi install-dvi-am install-exec install-exec-am \ | 825 | install-dvi install-dvi-am install-exec install-exec-am \ |
359 | 769 | install-html install-html-am install-info install-info-am \ | 826 | install-html install-html-am install-info install-info-am \ |
363 | 770 | install-man install-pdf install-pdf-am install-ps \ | 827 | install-man install-pdf install-pdf-am install-pkgconfigDATA \ |
364 | 771 | install-ps-am install-strip installcheck installcheck-am \ | 828 | install-ps install-ps-am install-strip installcheck \ |
365 | 772 | installdirs installdirs-am maintainer-clean \ | 829 | installcheck-am installdirs installdirs-am maintainer-clean \ |
366 | 773 | maintainer-clean-generic mostlyclean mostlyclean-generic \ | 830 | maintainer-clean-generic mostlyclean mostlyclean-generic \ |
367 | 774 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | 831 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
369 | 775 | uninstall uninstall-am | 832 | uninstall uninstall-am uninstall-pkgconfigDATA |
370 | 776 | 833 | ||
371 | 777 | 834 | ||
372 | 778 | # Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS | 835 | # Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS |
373 | 779 | 836 | ||
374 | === modified file 'README.txt' | |||
375 | --- README.txt 2009-06-24 00:19:03 +0000 | |||
376 | +++ README.txt 2010-01-18 04:34:17 +0000 | |||
377 | @@ -33,6 +33,44 @@ | |||
378 | 33 | If you already built the package with a different prefix, make sure | 33 | If you already built the package with a different prefix, make sure |
379 | 34 | to run "make clean" before building again. | 34 | to run "make clean" before building again. |
380 | 35 | 35 | ||
381 | 36 | ** Compiling dependent packages ** | ||
382 | 37 | |||
383 | 38 | To compile a package that uses Protocol Buffers, you need to pass | ||
384 | 39 | various flags to your compiler and linker. As of version 2.2.0, | ||
385 | 40 | Protocol Buffers integrates with pkg-config to manage this. If you | ||
386 | 41 | have pkg-config installed, then you can invoke it to get a list of | ||
387 | 42 | flags like so: | ||
388 | 43 | |||
389 | 44 | pkg-config --cflags protobuf # print compiler flags | ||
390 | 45 | pkg-config --libs protobuf # print linker flags | ||
391 | 46 | pkg-config --cflags --libs protobuf # print both | ||
392 | 47 | |||
393 | 48 | For example: | ||
394 | 49 | |||
395 | 50 | c++ my_program.cc my_proto.pb.cc `pkg-config --cflags --libs protobuf` | ||
396 | 51 | |||
397 | 52 | Note that packages written prior to the 2.2.0 release of Protocol | ||
398 | 53 | Buffers may not yet integrate with pkg-config to get flags, and may | ||
399 | 54 | not pass the correct set of flags to correctly link against | ||
400 | 55 | libprotobuf. If the package in question uses autoconf, you can | ||
401 | 56 | often fix the problem by invoking its configure script like: | ||
402 | 57 | |||
403 | 58 | configure CXXFLAGS="$(pkg-config --cflags protobuf)" \ | ||
404 | 59 | LIBS="$(pkg-config --libs protobuf)" | ||
405 | 60 | |||
406 | 61 | This will force it to use the correct flags. | ||
407 | 62 | |||
408 | 63 | If you are writing an autoconf-based package that uses Protocol | ||
409 | 64 | Buffers, you should probably use the PKG_CHECK_MODULES macro in your | ||
410 | 65 | configure script like: | ||
411 | 66 | |||
412 | 67 | PKG_CHECK_MODULES([protobuf], [protobuf]) | ||
413 | 68 | |||
414 | 69 | See the pkg-config man page for more info. | ||
415 | 70 | |||
416 | 71 | If you only want protobuf-lite, substitute "protobuf-lite" in place | ||
417 | 72 | of "protobuf" in these examples. | ||
418 | 73 | |||
419 | 36 | ** Note for cross-compiling ** | 74 | ** Note for cross-compiling ** |
420 | 37 | 75 | ||
421 | 38 | The makefiles normally invoke the protoc executable that they just | 76 | The makefiles normally invoke the protoc executable that they just |
422 | 39 | 77 | ||
423 | === modified file 'autogen.sh' | |||
424 | --- autogen.sh 2009-06-24 00:19:03 +0000 | |||
425 | +++ autogen.sh 2010-01-18 04:34:16 +0000 | |||
426 | @@ -13,23 +13,16 @@ | |||
427 | 13 | exit 1 | 13 | exit 1 |
428 | 14 | fi | 14 | fi |
429 | 15 | 15 | ||
435 | 16 | if test ! -d gtest; then | 16 | set -ex |
431 | 17 | echo "gtest bundle not present. Downloading gtest-1.3.0 automatically." >&2 | ||
432 | 18 | set -ex | ||
433 | 19 | curl http://googletest.googlecode.com/files/gtest-1.3.0.tar.bz2 | tar jx | ||
434 | 20 | mv gtest-1.3.0 gtest | ||
436 | 21 | 17 | ||
448 | 22 | # Temporary hack: Must change C runtime library to "multi-threaded DLL", | 18 | # Temporary hack: Must change C runtime library to "multi-threaded DLL", |
449 | 23 | # otherwise it will be set to "multi-threaded static" when MSVC upgrades | 19 | # otherwise it will be set to "multi-threaded static" when MSVC upgrades |
450 | 24 | # the project file to MSVC 2005/2008. vladl of Google Test says gtest will | 20 | # the project file to MSVC 2005/2008. vladl of Google Test says gtest will |
451 | 25 | # probably change their default to match, then this will be unnecessary. | 21 | # probably change their default to match, then this will be unnecessary. |
452 | 26 | # One of these mappings converts the debug configuration and the other | 22 | # One of these mappings converts the debug configuration and the other |
453 | 27 | # converts the release configuration. I don't know which is which. | 23 | # converts the release configuration. I don't know which is which. |
454 | 28 | sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g; | 24 | sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g; |
455 | 29 | s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj | 25 | s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj |
445 | 30 | else | ||
446 | 31 | set -ex | ||
447 | 32 | fi | ||
456 | 33 | 26 | ||
457 | 34 | # TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings. | 27 | # TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings. |
458 | 35 | autoreconf -f -i -Wall,no-obsolete | 28 | autoreconf -f -i -Wall,no-obsolete |
459 | 36 | 29 | ||
460 | === modified file 'configure' | |||
461 | --- configure 2009-06-24 00:19:03 +0000 | |||
462 | +++ configure 2010-01-18 04:34:17 +0000 | |||
463 | @@ -1,6 +1,6 @@ | |||
464 | 1 | #! /bin/sh | 1 | #! /bin/sh |
465 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
467 | 3 | # Generated by GNU Autoconf 2.61 for Protocol Buffers 2.1.0. | 3 | # Generated by GNU Autoconf 2.61 for Protocol Buffers 2.2.0a. |
468 | 4 | # | 4 | # |
469 | 5 | # Report bugs to <protobuf@googlegroups.com>. | 5 | # Report bugs to <protobuf@googlegroups.com>. |
470 | 6 | # | 6 | # |
471 | @@ -723,8 +723,8 @@ | |||
472 | 723 | # Identity of this package. | 723 | # Identity of this package. |
473 | 724 | PACKAGE_NAME='Protocol Buffers' | 724 | PACKAGE_NAME='Protocol Buffers' |
474 | 725 | PACKAGE_TARNAME='protobuf' | 725 | PACKAGE_TARNAME='protobuf' |
477 | 726 | PACKAGE_VERSION='2.1.0' | 726 | PACKAGE_VERSION='2.2.0a' |
478 | 727 | PACKAGE_STRING='Protocol Buffers 2.1.0' | 727 | PACKAGE_STRING='Protocol Buffers 2.2.0a' |
479 | 728 | PACKAGE_BUGREPORT='protobuf@googlegroups.com' | 728 | PACKAGE_BUGREPORT='protobuf@googlegroups.com' |
480 | 729 | 729 | ||
481 | 730 | ac_unique_file="src/google/protobuf/message.cc" | 730 | ac_unique_file="src/google/protobuf/message.cc" |
482 | @@ -801,6 +801,18 @@ | |||
483 | 801 | build_alias | 801 | build_alias |
484 | 802 | host_alias | 802 | host_alias |
485 | 803 | target_alias | 803 | target_alias |
486 | 804 | build | ||
487 | 805 | build_cpu | ||
488 | 806 | build_vendor | ||
489 | 807 | build_os | ||
490 | 808 | host | ||
491 | 809 | host_cpu | ||
492 | 810 | host_vendor | ||
493 | 811 | host_os | ||
494 | 812 | target | ||
495 | 813 | target_cpu | ||
496 | 814 | target_vendor | ||
497 | 815 | target_os | ||
498 | 804 | INSTALL_PROGRAM | 816 | INSTALL_PROGRAM |
499 | 805 | INSTALL_SCRIPT | 817 | INSTALL_SCRIPT |
500 | 806 | INSTALL_DATA | 818 | INSTALL_DATA |
501 | @@ -848,15 +860,11 @@ | |||
502 | 848 | CXXCPP | 860 | CXXCPP |
503 | 849 | GREP | 861 | GREP |
504 | 850 | EGREP | 862 | EGREP |
505 | 863 | GCC_TRUE | ||
506 | 864 | GCC_FALSE | ||
507 | 865 | PROTOBUF_OPT_FLAG | ||
508 | 866 | ISAINFO | ||
509 | 851 | LIBTOOL | 867 | LIBTOOL |
510 | 852 | build | ||
511 | 853 | build_cpu | ||
512 | 854 | build_vendor | ||
513 | 855 | build_os | ||
514 | 856 | host | ||
515 | 857 | host_cpu | ||
516 | 858 | host_vendor | ||
517 | 859 | host_os | ||
518 | 860 | SED | 868 | SED |
519 | 861 | FGREP | 869 | FGREP |
520 | 862 | LD | 870 | LD |
521 | @@ -872,9 +880,6 @@ | |||
522 | 872 | LIPO | 880 | LIPO |
523 | 873 | OTOOL | 881 | OTOOL |
524 | 874 | OTOOL64 | 882 | OTOOL64 |
525 | 875 | GCC_TRUE | ||
526 | 876 | GCC_FALSE | ||
527 | 877 | PROTOBUF_OPT_FLAG | ||
528 | 878 | LIBOBJS | 883 | LIBOBJS |
529 | 879 | POW_LIB | 884 | POW_LIB |
530 | 880 | HAVE_ZLIB_TRUE | 885 | HAVE_ZLIB_TRUE |
531 | @@ -1403,7 +1408,7 @@ | |||
532 | 1403 | # Omit some internal or obsolete options to make the list less imposing. | 1408 | # Omit some internal or obsolete options to make the list less imposing. |
533 | 1404 | # This message is too long to be a string in the A/UX 3.1 sh. | 1409 | # This message is too long to be a string in the A/UX 3.1 sh. |
534 | 1405 | cat <<_ACEOF | 1410 | cat <<_ACEOF |
536 | 1406 | \`configure' configures Protocol Buffers 2.1.0 to adapt to many kinds of systems. | 1411 | \`configure' configures Protocol Buffers 2.2.0a to adapt to many kinds of systems. |
537 | 1407 | 1412 | ||
538 | 1408 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1413 | Usage: $0 [OPTION]... [VAR=VALUE]... |
539 | 1409 | 1414 | ||
540 | @@ -1468,12 +1473,13 @@ | |||
541 | 1468 | System types: | 1473 | System types: |
542 | 1469 | --build=BUILD configure for building on BUILD [guessed] | 1474 | --build=BUILD configure for building on BUILD [guessed] |
543 | 1470 | --host=HOST cross-compile to build programs to run on HOST [BUILD] | 1475 | --host=HOST cross-compile to build programs to run on HOST [BUILD] |
544 | 1476 | --target=TARGET configure for building compilers for TARGET [HOST] | ||
545 | 1471 | _ACEOF | 1477 | _ACEOF |
546 | 1472 | fi | 1478 | fi |
547 | 1473 | 1479 | ||
548 | 1474 | if test -n "$ac_init_help"; then | 1480 | if test -n "$ac_init_help"; then |
549 | 1475 | case $ac_init_help in | 1481 | case $ac_init_help in |
551 | 1476 | short | recursive ) echo "Configuration of Protocol Buffers 2.1.0:";; | 1482 | short | recursive ) echo "Configuration of Protocol Buffers 2.2.0a:";; |
552 | 1477 | esac | 1483 | esac |
553 | 1478 | cat <<\_ACEOF | 1484 | cat <<\_ACEOF |
554 | 1479 | 1485 | ||
555 | @@ -1482,6 +1488,7 @@ | |||
556 | 1482 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | 1488 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
557 | 1483 | --disable-dependency-tracking speeds up one-time build | 1489 | --disable-dependency-tracking speeds up one-time build |
558 | 1484 | --enable-dependency-tracking do not reject slow dependency extractors | 1490 | --enable-dependency-tracking do not reject slow dependency extractors |
559 | 1491 | --disable-64bit-solaris Build 64 bit binary on Solaris [default=on] | ||
560 | 1485 | --enable-shared[=PKGS] build shared libraries [default=yes] | 1492 | --enable-shared[=PKGS] build shared libraries [default=yes] |
561 | 1486 | --enable-static[=PKGS] build static libraries [default=yes] | 1493 | --enable-static[=PKGS] build static libraries [default=yes] |
562 | 1487 | --enable-fast-install[=PKGS] | 1494 | --enable-fast-install[=PKGS] |
563 | @@ -1576,7 +1583,7 @@ | |||
564 | 1576 | test -n "$ac_init_help" && exit $ac_status | 1583 | test -n "$ac_init_help" && exit $ac_status |
565 | 1577 | if $ac_init_version; then | 1584 | if $ac_init_version; then |
566 | 1578 | cat <<\_ACEOF | 1585 | cat <<\_ACEOF |
568 | 1579 | Protocol Buffers configure 2.1.0 | 1586 | Protocol Buffers configure 2.2.0a |
569 | 1580 | generated by GNU Autoconf 2.61 | 1587 | generated by GNU Autoconf 2.61 |
570 | 1581 | 1588 | ||
571 | 1582 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 1589 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
572 | @@ -1590,7 +1597,7 @@ | |||
573 | 1590 | This file contains any messages produced by compilers while | 1597 | This file contains any messages produced by compilers while |
574 | 1591 | running configure, to aid debugging if configure makes a mistake. | 1598 | running configure, to aid debugging if configure makes a mistake. |
575 | 1592 | 1599 | ||
577 | 1593 | It was created by Protocol Buffers $as_me 2.1.0, which was | 1600 | It was created by Protocol Buffers $as_me 2.2.0a, which was |
578 | 1594 | generated by GNU Autoconf 2.61. Invocation command line was | 1601 | generated by GNU Autoconf 2.61. Invocation command line was |
579 | 1595 | 1602 | ||
580 | 1596 | $ $0 $@ | 1603 | $ $0 $@ |
581 | @@ -1944,20 +1951,22 @@ | |||
582 | 1944 | 1951 | ||
583 | 1945 | 1952 | ||
584 | 1946 | 1953 | ||
585 | 1947 | # Detect whether the user specified their own compilation flags. If so then | ||
586 | 1948 | # we want to respect their decision, otherwise we will twiddle them later. | ||
587 | 1949 | if test "$CXXFLAGS" = ""; then | ||
588 | 1950 | |||
589 | 1951 | protobuf_default_cxxflags=yes | ||
590 | 1952 | |||
591 | 1953 | fi | ||
592 | 1954 | |||
593 | 1955 | 1954 | ||
594 | 1956 | 1955 | ||
595 | 1957 | ac_config_headers="$ac_config_headers config.h" | 1956 | ac_config_headers="$ac_config_headers config.h" |
596 | 1958 | 1957 | ||
597 | 1959 | 1958 | ||
599 | 1960 | am__api_version='1.10' | 1959 | |
600 | 1960 | # autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily | ||
601 | 1961 | # the best choice for libprotobuf. | ||
602 | 1962 | if test "x${ac_cv_env_CFLAGS_set}" = "x"; then | ||
603 | 1963 | CFLAGS="" | ||
604 | 1964 | fi | ||
605 | 1965 | |||
606 | 1966 | if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then | ||
607 | 1967 | CXXFLAGS="" | ||
608 | 1968 | fi | ||
609 | 1969 | |||
610 | 1961 | 1970 | ||
611 | 1962 | ac_aux_dir= | 1971 | ac_aux_dir= |
612 | 1963 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | 1972 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
613 | @@ -1990,6 +1999,135 @@ | |||
614 | 1990 | ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. | 1999 | ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. |
615 | 1991 | 2000 | ||
616 | 1992 | 2001 | ||
617 | 2002 | # Make sure we can run config.sub. | ||
618 | 2003 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | ||
619 | 2004 | { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 | ||
620 | 2005 | echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} | ||
621 | 2006 | { (exit 1); exit 1; }; } | ||
622 | 2007 | |||
623 | 2008 | { echo "$as_me:$LINENO: checking build system type" >&5 | ||
624 | 2009 | echo $ECHO_N "checking build system type... $ECHO_C" >&6; } | ||
625 | 2010 | if test "${ac_cv_build+set}" = set; then | ||
626 | 2011 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
627 | 2012 | else | ||
628 | 2013 | ac_build_alias=$build_alias | ||
629 | 2014 | test "x$ac_build_alias" = x && | ||
630 | 2015 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | ||
631 | 2016 | test "x$ac_build_alias" = x && | ||
632 | 2017 | { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | ||
633 | 2018 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | ||
634 | 2019 | { (exit 1); exit 1; }; } | ||
635 | 2020 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | ||
636 | 2021 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 | ||
637 | 2022 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} | ||
638 | 2023 | { (exit 1); exit 1; }; } | ||
639 | 2024 | |||
640 | 2025 | fi | ||
641 | 2026 | { echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | ||
642 | 2027 | echo "${ECHO_T}$ac_cv_build" >&6; } | ||
643 | 2028 | case $ac_cv_build in | ||
644 | 2029 | *-*-*) ;; | ||
645 | 2030 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 | ||
646 | 2031 | echo "$as_me: error: invalid value of canonical build" >&2;} | ||
647 | 2032 | { (exit 1); exit 1; }; };; | ||
648 | 2033 | esac | ||
649 | 2034 | build=$ac_cv_build | ||
650 | 2035 | ac_save_IFS=$IFS; IFS='-' | ||
651 | 2036 | set x $ac_cv_build | ||
652 | 2037 | shift | ||
653 | 2038 | build_cpu=$1 | ||
654 | 2039 | build_vendor=$2 | ||
655 | 2040 | shift; shift | ||
656 | 2041 | # Remember, the first character of IFS is used to create $*, | ||
657 | 2042 | # except with old shells: | ||
658 | 2043 | build_os=$* | ||
659 | 2044 | IFS=$ac_save_IFS | ||
660 | 2045 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | ||
661 | 2046 | |||
662 | 2047 | |||
663 | 2048 | { echo "$as_me:$LINENO: checking host system type" >&5 | ||
664 | 2049 | echo $ECHO_N "checking host system type... $ECHO_C" >&6; } | ||
665 | 2050 | if test "${ac_cv_host+set}" = set; then | ||
666 | 2051 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
667 | 2052 | else | ||
668 | 2053 | if test "x$host_alias" = x; then | ||
669 | 2054 | ac_cv_host=$ac_cv_build | ||
670 | 2055 | else | ||
671 | 2056 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | ||
672 | 2057 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 | ||
673 | 2058 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} | ||
674 | 2059 | { (exit 1); exit 1; }; } | ||
675 | 2060 | fi | ||
676 | 2061 | |||
677 | 2062 | fi | ||
678 | 2063 | { echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | ||
679 | 2064 | echo "${ECHO_T}$ac_cv_host" >&6; } | ||
680 | 2065 | case $ac_cv_host in | ||
681 | 2066 | *-*-*) ;; | ||
682 | 2067 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 | ||
683 | 2068 | echo "$as_me: error: invalid value of canonical host" >&2;} | ||
684 | 2069 | { (exit 1); exit 1; }; };; | ||
685 | 2070 | esac | ||
686 | 2071 | host=$ac_cv_host | ||
687 | 2072 | ac_save_IFS=$IFS; IFS='-' | ||
688 | 2073 | set x $ac_cv_host | ||
689 | 2074 | shift | ||
690 | 2075 | host_cpu=$1 | ||
691 | 2076 | host_vendor=$2 | ||
692 | 2077 | shift; shift | ||
693 | 2078 | # Remember, the first character of IFS is used to create $*, | ||
694 | 2079 | # except with old shells: | ||
695 | 2080 | host_os=$* | ||
696 | 2081 | IFS=$ac_save_IFS | ||
697 | 2082 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | ||
698 | 2083 | |||
699 | 2084 | |||
700 | 2085 | { echo "$as_me:$LINENO: checking target system type" >&5 | ||
701 | 2086 | echo $ECHO_N "checking target system type... $ECHO_C" >&6; } | ||
702 | 2087 | if test "${ac_cv_target+set}" = set; then | ||
703 | 2088 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
704 | 2089 | else | ||
705 | 2090 | if test "x$target_alias" = x; then | ||
706 | 2091 | ac_cv_target=$ac_cv_host | ||
707 | 2092 | else | ||
708 | 2093 | ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || | ||
709 | 2094 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 | ||
710 | 2095 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} | ||
711 | 2096 | { (exit 1); exit 1; }; } | ||
712 | 2097 | fi | ||
713 | 2098 | |||
714 | 2099 | fi | ||
715 | 2100 | { echo "$as_me:$LINENO: result: $ac_cv_target" >&5 | ||
716 | 2101 | echo "${ECHO_T}$ac_cv_target" >&6; } | ||
717 | 2102 | case $ac_cv_target in | ||
718 | 2103 | *-*-*) ;; | ||
719 | 2104 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 | ||
720 | 2105 | echo "$as_me: error: invalid value of canonical target" >&2;} | ||
721 | 2106 | { (exit 1); exit 1; }; };; | ||
722 | 2107 | esac | ||
723 | 2108 | target=$ac_cv_target | ||
724 | 2109 | ac_save_IFS=$IFS; IFS='-' | ||
725 | 2110 | set x $ac_cv_target | ||
726 | 2111 | shift | ||
727 | 2112 | target_cpu=$1 | ||
728 | 2113 | target_vendor=$2 | ||
729 | 2114 | shift; shift | ||
730 | 2115 | # Remember, the first character of IFS is used to create $*, | ||
731 | 2116 | # except with old shells: | ||
732 | 2117 | target_os=$* | ||
733 | 2118 | IFS=$ac_save_IFS | ||
734 | 2119 | case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac | ||
735 | 2120 | |||
736 | 2121 | |||
737 | 2122 | # The aliases save the names the user supplied, while $host etc. | ||
738 | 2123 | # will get canonicalized. | ||
739 | 2124 | test -n "$target_alias" && | ||
740 | 2125 | test "$program_prefix$program_suffix$program_transform_name" = \ | ||
741 | 2126 | NONENONEs,x,x, && | ||
742 | 2127 | program_prefix=${target_alias}- | ||
743 | 2128 | |||
744 | 2129 | am__api_version='1.10' | ||
745 | 2130 | |||
746 | 1993 | # Find a good install program. We prefer a C program (faster), | 2131 | # Find a good install program. We prefer a C program (faster), |
747 | 1994 | # so one script is as good as another. But avoid the broken or | 2132 | # so one script is as good as another. But avoid the broken or |
748 | 1995 | # incompatible versions: | 2133 | # incompatible versions: |
749 | @@ -2294,7 +2432,7 @@ | |||
750 | 2294 | 2432 | ||
751 | 2295 | # Define the identity of the package. | 2433 | # Define the identity of the package. |
752 | 2296 | PACKAGE='protobuf' | 2434 | PACKAGE='protobuf' |
754 | 2297 | VERSION='2.1.0' | 2435 | VERSION='2.2.0a' |
755 | 2298 | 2436 | ||
756 | 2299 | 2437 | ||
757 | 2300 | cat >>confdefs.h <<_ACEOF | 2438 | cat >>confdefs.h <<_ACEOF |
758 | @@ -4929,6 +5067,237 @@ | |||
759 | 4929 | 5067 | ||
760 | 4930 | 5068 | ||
761 | 4931 | 5069 | ||
762 | 5070 | if test "$GCC" = yes; then | ||
763 | 5071 | GCC_TRUE= | ||
764 | 5072 | GCC_FALSE='#' | ||
765 | 5073 | else | ||
766 | 5074 | GCC_TRUE='#' | ||
767 | 5075 | GCC_FALSE= | ||
768 | 5076 | fi | ||
769 | 5077 | # let the Makefile know if we're gcc | ||
770 | 5078 | |||
771 | 5079 | # test_util.cc takes forever to compile with GCC and optimization turned on. | ||
772 | 5080 | { echo "$as_me:$LINENO: checking C++ compiler flags..." >&5 | ||
773 | 5081 | echo $ECHO_N "checking C++ compiler flags...... $ECHO_C" >&6; } | ||
774 | 5082 | if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then | ||
775 | 5083 | |||
776 | 5084 | if test "$GCC" = "yes"; then | ||
777 | 5085 | |||
778 | 5086 | PROTOBUF_OPT_FLAG="-O2" | ||
779 | 5087 | CXXFLAGS="${CXXFLAGS} -g" | ||
780 | 5088 | |||
781 | 5089 | fi | ||
782 | 5090 | |||
783 | 5091 | |||
784 | 5092 | # Protocol Buffers contains several checks that are intended to be used only | ||
785 | 5093 | # for debugging and which might hurt performance. Most users are probably | ||
786 | 5094 | # end users who don't want these checks, so add -DNDEBUG by default. | ||
787 | 5095 | CXXFLAGS="$CXXFLAGS -DNDEBUG" | ||
788 | 5096 | |||
789 | 5097 | { echo "$as_me:$LINENO: result: use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&5 | ||
790 | 5098 | echo "${ECHO_T}use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&6; } | ||
791 | 5099 | |||
792 | 5100 | else | ||
793 | 5101 | |||
794 | 5102 | { echo "$as_me:$LINENO: result: use user-supplied: $CXXFLAGS" >&5 | ||
795 | 5103 | echo "${ECHO_T}use user-supplied: $CXXFLAGS" >&6; } | ||
796 | 5104 | |||
797 | 5105 | fi | ||
798 | 5106 | |||
799 | 5107 | |||
800 | 5108 | |||
801 | 5109 | |||
802 | 5110 | |||
803 | 5111 | |||
804 | 5112 | ac_ext=cpp | ||
805 | 5113 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
806 | 5114 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
807 | 5115 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
808 | 5116 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
809 | 5117 | |||
810 | 5118 | { echo "$as_me:$LINENO: checking whether __SUNPRO_CC is declared" >&5 | ||
811 | 5119 | echo $ECHO_N "checking whether __SUNPRO_CC is declared... $ECHO_C" >&6; } | ||
812 | 5120 | if test "${ac_cv_have_decl___SUNPRO_CC+set}" = set; then | ||
813 | 5121 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
814 | 5122 | else | ||
815 | 5123 | cat >conftest.$ac_ext <<_ACEOF | ||
816 | 5124 | /* confdefs.h. */ | ||
817 | 5125 | _ACEOF | ||
818 | 5126 | cat confdefs.h >>conftest.$ac_ext | ||
819 | 5127 | cat >>conftest.$ac_ext <<_ACEOF | ||
820 | 5128 | /* end confdefs.h. */ | ||
821 | 5129 | $ac_includes_default | ||
822 | 5130 | int | ||
823 | 5131 | main () | ||
824 | 5132 | { | ||
825 | 5133 | #ifndef __SUNPRO_CC | ||
826 | 5134 | (void) __SUNPRO_CC; | ||
827 | 5135 | #endif | ||
828 | 5136 | |||
829 | 5137 | ; | ||
830 | 5138 | return 0; | ||
831 | 5139 | } | ||
832 | 5140 | _ACEOF | ||
833 | 5141 | rm -f conftest.$ac_objext | ||
834 | 5142 | if { (ac_try="$ac_compile" | ||
835 | 5143 | case "(($ac_try" in | ||
836 | 5144 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
837 | 5145 | *) ac_try_echo=$ac_try;; | ||
838 | 5146 | esac | ||
839 | 5147 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
840 | 5148 | (eval "$ac_compile") 2>conftest.er1 | ||
841 | 5149 | ac_status=$? | ||
842 | 5150 | grep -v '^ *+' conftest.er1 >conftest.err | ||
843 | 5151 | rm -f conftest.er1 | ||
844 | 5152 | cat conftest.err >&5 | ||
845 | 5153 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
846 | 5154 | (exit $ac_status); } && { | ||
847 | 5155 | test -z "$ac_cxx_werror_flag" || | ||
848 | 5156 | test ! -s conftest.err | ||
849 | 5157 | } && test -s conftest.$ac_objext; then | ||
850 | 5158 | ac_cv_have_decl___SUNPRO_CC=yes | ||
851 | 5159 | else | ||
852 | 5160 | echo "$as_me: failed program was:" >&5 | ||
853 | 5161 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
854 | 5162 | |||
855 | 5163 | ac_cv_have_decl___SUNPRO_CC=no | ||
856 | 5164 | fi | ||
857 | 5165 | |||
858 | 5166 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
859 | 5167 | fi | ||
860 | 5168 | { echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_CC" >&5 | ||
861 | 5169 | echo "${ECHO_T}$ac_cv_have_decl___SUNPRO_CC" >&6; } | ||
862 | 5170 | if test $ac_cv_have_decl___SUNPRO_CC = yes; then | ||
863 | 5171 | SUNCC="yes" | ||
864 | 5172 | else | ||
865 | 5173 | SUNCC="no" | ||
866 | 5174 | fi | ||
867 | 5175 | |||
868 | 5176 | ac_ext=cpp | ||
869 | 5177 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
870 | 5178 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
871 | 5179 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
872 | 5180 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
873 | 5181 | |||
874 | 5182 | |||
875 | 5183 | |||
876 | 5184 | # Check whether --enable-64bit-solaris was given. | ||
877 | 5185 | if test "${enable_64bit_solaris+set}" = set; then | ||
878 | 5186 | enableval=$enable_64bit_solaris; ac_enable_64bit="$enableval" | ||
879 | 5187 | else | ||
880 | 5188 | ac_enable_64bit="yes" | ||
881 | 5189 | fi | ||
882 | 5190 | |||
883 | 5191 | |||
884 | 5192 | if test "$SUNCC" = "yes" -a "x${ac_cv_env_CXXFLAGS_set}" = "x"; then | ||
885 | 5193 | |||
886 | 5194 | CXXFLAGS="-g0 -xO3 -xlibmil -xdepend -xbuiltin -mt -compat=5 -library=stlport4 -template=no%extdef ${CXXFLAGS}" | ||
887 | 5195 | |||
888 | 5196 | fi | ||
889 | 5197 | |||
890 | 5198 | |||
891 | 5199 | case $host_os in | ||
892 | 5200 | *solaris*) | ||
893 | 5201 | for ac_prog in isainfo | ||
894 | 5202 | do | ||
895 | 5203 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
896 | 5204 | set dummy $ac_prog; ac_word=$2 | ||
897 | 5205 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
898 | 5206 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | ||
899 | 5207 | if test "${ac_cv_prog_ISAINFO+set}" = set; then | ||
900 | 5208 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
901 | 5209 | else | ||
902 | 5210 | if test -n "$ISAINFO"; then | ||
903 | 5211 | ac_cv_prog_ISAINFO="$ISAINFO" # Let the user override the test. | ||
904 | 5212 | else | ||
905 | 5213 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
906 | 5214 | for as_dir in $PATH | ||
907 | 5215 | do | ||
908 | 5216 | IFS=$as_save_IFS | ||
909 | 5217 | test -z "$as_dir" && as_dir=. | ||
910 | 5218 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
911 | 5219 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
912 | 5220 | ac_cv_prog_ISAINFO="$ac_prog" | ||
913 | 5221 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
914 | 5222 | break 2 | ||
915 | 5223 | fi | ||
916 | 5224 | done | ||
917 | 5225 | done | ||
918 | 5226 | IFS=$as_save_IFS | ||
919 | 5227 | |||
920 | 5228 | fi | ||
921 | 5229 | fi | ||
922 | 5230 | ISAINFO=$ac_cv_prog_ISAINFO | ||
923 | 5231 | if test -n "$ISAINFO"; then | ||
924 | 5232 | { echo "$as_me:$LINENO: result: $ISAINFO" >&5 | ||
925 | 5233 | echo "${ECHO_T}$ISAINFO" >&6; } | ||
926 | 5234 | else | ||
927 | 5235 | { echo "$as_me:$LINENO: result: no" >&5 | ||
928 | 5236 | echo "${ECHO_T}no" >&6; } | ||
929 | 5237 | fi | ||
930 | 5238 | |||
931 | 5239 | |||
932 | 5240 | test -n "$ISAINFO" && break | ||
933 | 5241 | done | ||
934 | 5242 | test -n "$ISAINFO" || ISAINFO="no" | ||
935 | 5243 | |||
936 | 5244 | if test "x$ISAINFO" != "xno"; then | ||
937 | 5245 | isainfo_b=`${ISAINFO} -b` | ||
938 | 5246 | else | ||
939 | 5247 | isainfo_b="x" | ||
940 | 5248 | fi | ||
941 | 5249 | |||
942 | 5250 | |||
943 | 5251 | if test "$isainfo_b" != "x"; then | ||
944 | 5252 | |||
945 | 5253 | |||
946 | 5254 | isainfo_k=`${ISAINFO} -k` | ||
947 | 5255 | |||
948 | 5256 | if test "x$ac_enable_64bit" = "xyes"; then | ||
949 | 5257 | |||
950 | 5258 | |||
951 | 5259 | if test "x${ac_cv_env_LDFLAGS_set}" = "x"; then | ||
952 | 5260 | |||
953 | 5261 | LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}" | ||
954 | 5262 | |||
955 | 5263 | fi | ||
956 | 5264 | |||
957 | 5265 | |||
958 | 5266 | if test "x$libdir" = "x\${exec_prefix}/lib"; then | ||
959 | 5267 | |||
960 | 5268 | libdir="${libdir}/${isainfo_k}" | ||
961 | 5269 | |||
962 | 5270 | fi | ||
963 | 5271 | |||
964 | 5272 | |||
965 | 5273 | if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then | ||
966 | 5274 | |||
967 | 5275 | CXXFLAGS="${CXXFLAGS} -m64" | ||
968 | 5276 | ac_cv_env_CXXFLAGS_set=set | ||
969 | 5277 | ac_cv_env_CXXFLAGS_value='-m64' | ||
970 | 5278 | |||
971 | 5279 | fi | ||
972 | 5280 | |||
973 | 5281 | |||
974 | 5282 | if test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ; then | ||
975 | 5283 | |||
976 | 5284 | CXXFLAGS="-xmemalign=8s ${CXXFLAGS}" | ||
977 | 5285 | |||
978 | 5286 | fi | ||
979 | 5287 | |||
980 | 5288 | |||
981 | 5289 | fi | ||
982 | 5290 | |||
983 | 5291 | |||
984 | 5292 | fi | ||
985 | 5293 | |||
986 | 5294 | ;; | ||
987 | 5295 | esac | ||
988 | 5296 | |||
989 | 5297 | |||
990 | 5298 | |||
991 | 5299 | # Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd | ||
992 | 5300 | # to the link | ||
993 | 4932 | case `pwd` in | 5301 | case `pwd` in |
994 | 4933 | *\ * | *\ *) | 5302 | *\ * | *\ *) |
995 | 4934 | { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 | 5303 | { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 |
996 | @@ -4954,89 +5323,6 @@ | |||
997 | 4954 | 5323 | ||
998 | 4955 | ltmain="$ac_aux_dir/ltmain.sh" | 5324 | ltmain="$ac_aux_dir/ltmain.sh" |
999 | 4956 | 5325 | ||
1000 | 4957 | # Make sure we can run config.sub. | ||
1001 | 4958 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | ||
1002 | 4959 | { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 | ||
1003 | 4960 | echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} | ||
1004 | 4961 | { (exit 1); exit 1; }; } | ||
1005 | 4962 | |||
1006 | 4963 | { echo "$as_me:$LINENO: checking build system type" >&5 | ||
1007 | 4964 | echo $ECHO_N "checking build system type... $ECHO_C" >&6; } | ||
1008 | 4965 | if test "${ac_cv_build+set}" = set; then | ||
1009 | 4966 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1010 | 4967 | else | ||
1011 | 4968 | ac_build_alias=$build_alias | ||
1012 | 4969 | test "x$ac_build_alias" = x && | ||
1013 | 4970 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | ||
1014 | 4971 | test "x$ac_build_alias" = x && | ||
1015 | 4972 | { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | ||
1016 | 4973 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | ||
1017 | 4974 | { (exit 1); exit 1; }; } | ||
1018 | 4975 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | ||
1019 | 4976 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 | ||
1020 | 4977 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} | ||
1021 | 4978 | { (exit 1); exit 1; }; } | ||
1022 | 4979 | |||
1023 | 4980 | fi | ||
1024 | 4981 | { echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | ||
1025 | 4982 | echo "${ECHO_T}$ac_cv_build" >&6; } | ||
1026 | 4983 | case $ac_cv_build in | ||
1027 | 4984 | *-*-*) ;; | ||
1028 | 4985 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 | ||
1029 | 4986 | echo "$as_me: error: invalid value of canonical build" >&2;} | ||
1030 | 4987 | { (exit 1); exit 1; }; };; | ||
1031 | 4988 | esac | ||
1032 | 4989 | build=$ac_cv_build | ||
1033 | 4990 | ac_save_IFS=$IFS; IFS='-' | ||
1034 | 4991 | set x $ac_cv_build | ||
1035 | 4992 | shift | ||
1036 | 4993 | build_cpu=$1 | ||
1037 | 4994 | build_vendor=$2 | ||
1038 | 4995 | shift; shift | ||
1039 | 4996 | # Remember, the first character of IFS is used to create $*, | ||
1040 | 4997 | # except with old shells: | ||
1041 | 4998 | build_os=$* | ||
1042 | 4999 | IFS=$ac_save_IFS | ||
1043 | 5000 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | ||
1044 | 5001 | |||
1045 | 5002 | |||
1046 | 5003 | { echo "$as_me:$LINENO: checking host system type" >&5 | ||
1047 | 5004 | echo $ECHO_N "checking host system type... $ECHO_C" >&6; } | ||
1048 | 5005 | if test "${ac_cv_host+set}" = set; then | ||
1049 | 5006 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1050 | 5007 | else | ||
1051 | 5008 | if test "x$host_alias" = x; then | ||
1052 | 5009 | ac_cv_host=$ac_cv_build | ||
1053 | 5010 | else | ||
1054 | 5011 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | ||
1055 | 5012 | { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 | ||
1056 | 5013 | echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} | ||
1057 | 5014 | { (exit 1); exit 1; }; } | ||
1058 | 5015 | fi | ||
1059 | 5016 | |||
1060 | 5017 | fi | ||
1061 | 5018 | { echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | ||
1062 | 5019 | echo "${ECHO_T}$ac_cv_host" >&6; } | ||
1063 | 5020 | case $ac_cv_host in | ||
1064 | 5021 | *-*-*) ;; | ||
1065 | 5022 | *) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 | ||
1066 | 5023 | echo "$as_me: error: invalid value of canonical host" >&2;} | ||
1067 | 5024 | { (exit 1); exit 1; }; };; | ||
1068 | 5025 | esac | ||
1069 | 5026 | host=$ac_cv_host | ||
1070 | 5027 | ac_save_IFS=$IFS; IFS='-' | ||
1071 | 5028 | set x $ac_cv_host | ||
1072 | 5029 | shift | ||
1073 | 5030 | host_cpu=$1 | ||
1074 | 5031 | host_vendor=$2 | ||
1075 | 5032 | shift; shift | ||
1076 | 5033 | # Remember, the first character of IFS is used to create $*, | ||
1077 | 5034 | # except with old shells: | ||
1078 | 5035 | host_os=$* | ||
1079 | 5036 | IFS=$ac_save_IFS | ||
1080 | 5037 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | ||
1081 | 5038 | |||
1082 | 5039 | |||
1083 | 5040 | { echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 | 5326 | { echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 |
1084 | 5041 | echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } | 5327 | echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } |
1085 | 5042 | if test "${ac_cv_path_SED+set}" = set; then | 5328 | if test "${ac_cv_path_SED+set}" = set; then |
1086 | @@ -5528,13 +5814,13 @@ | |||
1087 | 5528 | else | 5814 | else |
1088 | 5529 | lt_cv_nm_interface="BSD nm" | 5815 | lt_cv_nm_interface="BSD nm" |
1089 | 5530 | echo "int some_variable = 0;" > conftest.$ac_ext | 5816 | echo "int some_variable = 0;" > conftest.$ac_ext |
1091 | 5531 | (eval echo "\"\$as_me:5531: $ac_compile\"" >&5) | 5817 | (eval echo "\"\$as_me:5817: $ac_compile\"" >&5) |
1092 | 5532 | (eval "$ac_compile" 2>conftest.err) | 5818 | (eval "$ac_compile" 2>conftest.err) |
1093 | 5533 | cat conftest.err >&5 | 5819 | cat conftest.err >&5 |
1095 | 5534 | (eval echo "\"\$as_me:5534: $NM \\\"conftest.$ac_objext\\\"\"" >&5) | 5820 | (eval echo "\"\$as_me:5820: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
1096 | 5535 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 5821 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
1097 | 5536 | cat conftest.err >&5 | 5822 | cat conftest.err >&5 |
1099 | 5537 | (eval echo "\"\$as_me:5537: output\"" >&5) | 5823 | (eval echo "\"\$as_me:5823: output\"" >&5) |
1100 | 5538 | cat conftest.out >&5 | 5824 | cat conftest.out >&5 |
1101 | 5539 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 5825 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
1102 | 5540 | lt_cv_nm_interface="MS dumpbin" | 5826 | lt_cv_nm_interface="MS dumpbin" |
1103 | @@ -6645,7 +6931,7 @@ | |||
1104 | 6645 | ;; | 6931 | ;; |
1105 | 6646 | *-*-irix6*) | 6932 | *-*-irix6*) |
1106 | 6647 | # Find out which ABI we are using. | 6933 | # Find out which ABI we are using. |
1108 | 6648 | echo '#line 6648 "configure"' > conftest.$ac_ext | 6934 | echo '#line 6934 "configure"' > conftest.$ac_ext |
1109 | 6649 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | 6935 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1110 | 6650 | (eval $ac_compile) 2>&5 | 6936 | (eval $ac_compile) 2>&5 |
1111 | 6651 | ac_status=$? | 6937 | ac_status=$? |
1112 | @@ -8726,11 +9012,11 @@ | |||
1113 | 8726 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 9012 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1114 | 8727 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 9013 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1115 | 8728 | -e 's:$: $lt_compiler_flag:'` | 9014 | -e 's:$: $lt_compiler_flag:'` |
1117 | 8729 | (eval echo "\"\$as_me:8729: $lt_compile\"" >&5) | 9015 | (eval echo "\"\$as_me:9015: $lt_compile\"" >&5) |
1118 | 8730 | (eval "$lt_compile" 2>conftest.err) | 9016 | (eval "$lt_compile" 2>conftest.err) |
1119 | 8731 | ac_status=$? | 9017 | ac_status=$? |
1120 | 8732 | cat conftest.err >&5 | 9018 | cat conftest.err >&5 |
1122 | 8733 | echo "$as_me:8733: \$? = $ac_status" >&5 | 9019 | echo "$as_me:9019: \$? = $ac_status" >&5 |
1123 | 8734 | if (exit $ac_status) && test -s "$ac_outfile"; then | 9020 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1124 | 8735 | # The compiler can only warn and ignore the option if not recognized | 9021 | # The compiler can only warn and ignore the option if not recognized |
1125 | 8736 | # So say no if there are warnings other than the usual output. | 9022 | # So say no if there are warnings other than the usual output. |
1126 | @@ -9050,11 +9336,11 @@ | |||
1127 | 9050 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 9336 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1128 | 9051 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 9337 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1129 | 9052 | -e 's:$: $lt_compiler_flag:'` | 9338 | -e 's:$: $lt_compiler_flag:'` |
1131 | 9053 | (eval echo "\"\$as_me:9053: $lt_compile\"" >&5) | 9339 | (eval echo "\"\$as_me:9339: $lt_compile\"" >&5) |
1132 | 9054 | (eval "$lt_compile" 2>conftest.err) | 9340 | (eval "$lt_compile" 2>conftest.err) |
1133 | 9055 | ac_status=$? | 9341 | ac_status=$? |
1134 | 9056 | cat conftest.err >&5 | 9342 | cat conftest.err >&5 |
1136 | 9057 | echo "$as_me:9057: \$? = $ac_status" >&5 | 9343 | echo "$as_me:9343: \$? = $ac_status" >&5 |
1137 | 9058 | if (exit $ac_status) && test -s "$ac_outfile"; then | 9344 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1138 | 9059 | # The compiler can only warn and ignore the option if not recognized | 9345 | # The compiler can only warn and ignore the option if not recognized |
1139 | 9060 | # So say no if there are warnings other than the usual output. | 9346 | # So say no if there are warnings other than the usual output. |
1140 | @@ -9155,11 +9441,11 @@ | |||
1141 | 9155 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 9441 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1142 | 9156 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 9442 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1143 | 9157 | -e 's:$: $lt_compiler_flag:'` | 9443 | -e 's:$: $lt_compiler_flag:'` |
1145 | 9158 | (eval echo "\"\$as_me:9158: $lt_compile\"" >&5) | 9444 | (eval echo "\"\$as_me:9444: $lt_compile\"" >&5) |
1146 | 9159 | (eval "$lt_compile" 2>out/conftest.err) | 9445 | (eval "$lt_compile" 2>out/conftest.err) |
1147 | 9160 | ac_status=$? | 9446 | ac_status=$? |
1148 | 9161 | cat out/conftest.err >&5 | 9447 | cat out/conftest.err >&5 |
1150 | 9162 | echo "$as_me:9162: \$? = $ac_status" >&5 | 9448 | echo "$as_me:9448: \$? = $ac_status" >&5 |
1151 | 9163 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 9449 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1152 | 9164 | then | 9450 | then |
1153 | 9165 | # The compiler can only warn and ignore the option if not recognized | 9451 | # The compiler can only warn and ignore the option if not recognized |
1154 | @@ -9210,11 +9496,11 @@ | |||
1155 | 9210 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 9496 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1156 | 9211 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 9497 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1157 | 9212 | -e 's:$: $lt_compiler_flag:'` | 9498 | -e 's:$: $lt_compiler_flag:'` |
1159 | 9213 | (eval echo "\"\$as_me:9213: $lt_compile\"" >&5) | 9499 | (eval echo "\"\$as_me:9499: $lt_compile\"" >&5) |
1160 | 9214 | (eval "$lt_compile" 2>out/conftest.err) | 9500 | (eval "$lt_compile" 2>out/conftest.err) |
1161 | 9215 | ac_status=$? | 9501 | ac_status=$? |
1162 | 9216 | cat out/conftest.err >&5 | 9502 | cat out/conftest.err >&5 |
1164 | 9217 | echo "$as_me:9217: \$? = $ac_status" >&5 | 9503 | echo "$as_me:9503: \$? = $ac_status" >&5 |
1165 | 9218 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 9504 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1166 | 9219 | then | 9505 | then |
1167 | 9220 | # The compiler can only warn and ignore the option if not recognized | 9506 | # The compiler can only warn and ignore the option if not recognized |
1168 | @@ -11958,7 +12244,7 @@ | |||
1169 | 11958 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 12244 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1170 | 11959 | lt_status=$lt_dlunknown | 12245 | lt_status=$lt_dlunknown |
1171 | 11960 | cat > conftest.$ac_ext <<_LT_EOF | 12246 | cat > conftest.$ac_ext <<_LT_EOF |
1173 | 11961 | #line 11961 "configure" | 12247 | #line 12247 "configure" |
1174 | 11962 | #include "confdefs.h" | 12248 | #include "confdefs.h" |
1175 | 11963 | 12249 | ||
1176 | 11964 | #if HAVE_DLFCN_H | 12250 | #if HAVE_DLFCN_H |
1177 | @@ -12058,7 +12344,7 @@ | |||
1178 | 12058 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 12344 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1179 | 12059 | lt_status=$lt_dlunknown | 12345 | lt_status=$lt_dlunknown |
1180 | 12060 | cat > conftest.$ac_ext <<_LT_EOF | 12346 | cat > conftest.$ac_ext <<_LT_EOF |
1182 | 12061 | #line 12061 "configure" | 12347 | #line 12347 "configure" |
1183 | 12062 | #include "confdefs.h" | 12348 | #include "confdefs.h" |
1184 | 12063 | 12349 | ||
1185 | 12064 | #if HAVE_DLFCN_H | 12350 | #if HAVE_DLFCN_H |
1186 | @@ -14061,11 +14347,11 @@ | |||
1187 | 14061 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 14347 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1188 | 14062 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 14348 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1189 | 14063 | -e 's:$: $lt_compiler_flag:'` | 14349 | -e 's:$: $lt_compiler_flag:'` |
1191 | 14064 | (eval echo "\"\$as_me:14064: $lt_compile\"" >&5) | 14350 | (eval echo "\"\$as_me:14350: $lt_compile\"" >&5) |
1192 | 14065 | (eval "$lt_compile" 2>conftest.err) | 14351 | (eval "$lt_compile" 2>conftest.err) |
1193 | 14066 | ac_status=$? | 14352 | ac_status=$? |
1194 | 14067 | cat conftest.err >&5 | 14353 | cat conftest.err >&5 |
1196 | 14068 | echo "$as_me:14068: \$? = $ac_status" >&5 | 14354 | echo "$as_me:14354: \$? = $ac_status" >&5 |
1197 | 14069 | if (exit $ac_status) && test -s "$ac_outfile"; then | 14355 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1198 | 14070 | # The compiler can only warn and ignore the option if not recognized | 14356 | # The compiler can only warn and ignore the option if not recognized |
1199 | 14071 | # So say no if there are warnings other than the usual output. | 14357 | # So say no if there are warnings other than the usual output. |
1200 | @@ -14160,11 +14446,11 @@ | |||
1201 | 14160 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 14446 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1202 | 14161 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 14447 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1203 | 14162 | -e 's:$: $lt_compiler_flag:'` | 14448 | -e 's:$: $lt_compiler_flag:'` |
1205 | 14163 | (eval echo "\"\$as_me:14163: $lt_compile\"" >&5) | 14449 | (eval echo "\"\$as_me:14449: $lt_compile\"" >&5) |
1206 | 14164 | (eval "$lt_compile" 2>out/conftest.err) | 14450 | (eval "$lt_compile" 2>out/conftest.err) |
1207 | 14165 | ac_status=$? | 14451 | ac_status=$? |
1208 | 14166 | cat out/conftest.err >&5 | 14452 | cat out/conftest.err >&5 |
1210 | 14167 | echo "$as_me:14167: \$? = $ac_status" >&5 | 14453 | echo "$as_me:14453: \$? = $ac_status" >&5 |
1211 | 14168 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 14454 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1212 | 14169 | then | 14455 | then |
1213 | 14170 | # The compiler can only warn and ignore the option if not recognized | 14456 | # The compiler can only warn and ignore the option if not recognized |
1214 | @@ -14212,11 +14498,11 @@ | |||
1215 | 14212 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 14498 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1216 | 14213 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 14499 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1217 | 14214 | -e 's:$: $lt_compiler_flag:'` | 14500 | -e 's:$: $lt_compiler_flag:'` |
1219 | 14215 | (eval echo "\"\$as_me:14215: $lt_compile\"" >&5) | 14501 | (eval echo "\"\$as_me:14501: $lt_compile\"" >&5) |
1220 | 14216 | (eval "$lt_compile" 2>out/conftest.err) | 14502 | (eval "$lt_compile" 2>out/conftest.err) |
1221 | 14217 | ac_status=$? | 14503 | ac_status=$? |
1222 | 14218 | cat out/conftest.err >&5 | 14504 | cat out/conftest.err >&5 |
1224 | 14219 | echo "$as_me:14219: \$? = $ac_status" >&5 | 14505 | echo "$as_me:14505: \$? = $ac_status" >&5 |
1225 | 14220 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 14506 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1226 | 14221 | then | 14507 | then |
1227 | 14222 | # The compiler can only warn and ignore the option if not recognized | 14508 | # The compiler can only warn and ignore the option if not recognized |
1228 | @@ -15192,143 +15478,6 @@ | |||
1229 | 15192 | # Only expand once: | 15478 | # Only expand once: |
1230 | 15193 | 15479 | ||
1231 | 15194 | 15480 | ||
1232 | 15195 | if test "$GCC" = yes; then | ||
1233 | 15196 | GCC_TRUE= | ||
1234 | 15197 | GCC_FALSE='#' | ||
1235 | 15198 | else | ||
1236 | 15199 | GCC_TRUE='#' | ||
1237 | 15200 | GCC_FALSE= | ||
1238 | 15201 | fi | ||
1239 | 15202 | # let the Makefile know if we're gcc | ||
1240 | 15203 | |||
1241 | 15204 | # autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily | ||
1242 | 15205 | # the best choice for libprotobuf. | ||
1243 | 15206 | { echo "$as_me:$LINENO: checking C++ compiler flags..." >&5 | ||
1244 | 15207 | echo $ECHO_N "checking C++ compiler flags...... $ECHO_C" >&6; } | ||
1245 | 15208 | if test "$protobuf_default_cxxflags" = "yes"; then | ||
1246 | 15209 | |||
1247 | 15210 | |||
1248 | 15211 | # test_util.cc takes forever to compile with GCC and optimization turned on. | ||
1249 | 15212 | # But we cannot override anything that is part of CXXFLAGS since it is the | ||
1250 | 15213 | # last thing added to the command line. The automake docs insist that you | ||
1251 | 15214 | # should never want to override CXXFLAGS because they represent the intent of | ||
1252 | 15215 | # the user, and the user knows best. But if the user actually did not set | ||
1253 | 15216 | # any CXXFLAGS, then AC_PROG_CXX sets them to a rather arbitrary default. | ||
1254 | 15217 | # That's not user intent at all, but automake still treats it like it is. | ||
1255 | 15218 | # Grr. Anyway, getting back to the point, this hack here strips out the -O | ||
1256 | 15219 | # flag from autoconf's defaults and puts it into another variable so that | ||
1257 | 15220 | # we can override it. BTW, m4 escaping sucks. | ||
1258 | 15221 | PROTOBUF_OPT_FLAG=`echo "$CXXFLAGS" | grep -o '\-O[0-9]\?'` | ||
1259 | 15222 | CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ \?-O[0-9]\?//g'` | ||
1260 | 15223 | |||
1261 | 15224 | # Protocol Buffers contains several checks that are intended to be used only | ||
1262 | 15225 | # for debugging and which might hurt performance. Most users are probably | ||
1263 | 15226 | # end users who don't want these checks, so add -DNDEBUG by default. | ||
1264 | 15227 | CXXFLAGS="$CXXFLAGS -DNDEBUG" | ||
1265 | 15228 | |||
1266 | 15229 | { echo "$as_me:$LINENO: result: use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&5 | ||
1267 | 15230 | echo "${ECHO_T}use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&6; } | ||
1268 | 15231 | |||
1269 | 15232 | else | ||
1270 | 15233 | |||
1271 | 15234 | PROTOBUF_OPT_FLAG= | ||
1272 | 15235 | { echo "$as_me:$LINENO: result: use user-supplied: $CXXFLAGS" >&5 | ||
1273 | 15236 | echo "${ECHO_T}use user-supplied: $CXXFLAGS" >&6; } | ||
1274 | 15237 | |||
1275 | 15238 | fi | ||
1276 | 15239 | |||
1277 | 15240 | |||
1278 | 15241 | |||
1279 | 15242 | |||
1280 | 15243 | |||
1281 | 15244 | |||
1282 | 15245 | { echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 | ||
1283 | 15246 | echo $ECHO_N "checking whether __SUNPRO_C is declared... $ECHO_C" >&6; } | ||
1284 | 15247 | if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then | ||
1285 | 15248 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1286 | 15249 | else | ||
1287 | 15250 | cat >conftest.$ac_ext <<_ACEOF | ||
1288 | 15251 | /* confdefs.h. */ | ||
1289 | 15252 | _ACEOF | ||
1290 | 15253 | cat confdefs.h >>conftest.$ac_ext | ||
1291 | 15254 | cat >>conftest.$ac_ext <<_ACEOF | ||
1292 | 15255 | /* end confdefs.h. */ | ||
1293 | 15256 | $ac_includes_default | ||
1294 | 15257 | int | ||
1295 | 15258 | main () | ||
1296 | 15259 | { | ||
1297 | 15260 | #ifndef __SUNPRO_C | ||
1298 | 15261 | (void) __SUNPRO_C; | ||
1299 | 15262 | #endif | ||
1300 | 15263 | |||
1301 | 15264 | ; | ||
1302 | 15265 | return 0; | ||
1303 | 15266 | } | ||
1304 | 15267 | _ACEOF | ||
1305 | 15268 | rm -f conftest.$ac_objext | ||
1306 | 15269 | if { (ac_try="$ac_compile" | ||
1307 | 15270 | case "(($ac_try" in | ||
1308 | 15271 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
1309 | 15272 | *) ac_try_echo=$ac_try;; | ||
1310 | 15273 | esac | ||
1311 | 15274 | eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
1312 | 15275 | (eval "$ac_compile") 2>conftest.er1 | ||
1313 | 15276 | ac_status=$? | ||
1314 | 15277 | grep -v '^ *+' conftest.er1 >conftest.err | ||
1315 | 15278 | rm -f conftest.er1 | ||
1316 | 15279 | cat conftest.err >&5 | ||
1317 | 15280 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1318 | 15281 | (exit $ac_status); } && { | ||
1319 | 15282 | test -z "$ac_cxx_werror_flag" || | ||
1320 | 15283 | test ! -s conftest.err | ||
1321 | 15284 | } && test -s conftest.$ac_objext; then | ||
1322 | 15285 | ac_cv_have_decl___SUNPRO_C=yes | ||
1323 | 15286 | else | ||
1324 | 15287 | echo "$as_me: failed program was:" >&5 | ||
1325 | 15288 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
1326 | 15289 | |||
1327 | 15290 | ac_cv_have_decl___SUNPRO_C=no | ||
1328 | 15291 | fi | ||
1329 | 15292 | |||
1330 | 15293 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1331 | 15294 | fi | ||
1332 | 15295 | { echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 | ||
1333 | 15296 | echo "${ECHO_T}$ac_cv_have_decl___SUNPRO_C" >&6; } | ||
1334 | 15297 | if test $ac_cv_have_decl___SUNPRO_C = yes; then | ||
1335 | 15298 | SUNCC="yes" | ||
1336 | 15299 | else | ||
1337 | 15300 | SUNCC="no" | ||
1338 | 15301 | fi | ||
1339 | 15302 | |||
1340 | 15303 | |||
1341 | 15304 | if test "$SUNCC" = "yes"; then | ||
1342 | 15305 | |||
1343 | 15306 | isainfo_k=`isainfo -k` | ||
1344 | 15307 | if test "$target_cpu" = "sparc"; then | ||
1345 | 15308 | |||
1346 | 15309 | MEMALIGN_FLAGS="-xmemalign=8s" | ||
1347 | 15310 | IS_64="-m64" | ||
1348 | 15311 | LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}" | ||
1349 | 15312 | |||
1350 | 15313 | else | ||
1351 | 15314 | |||
1352 | 15315 | if test "$isainfo_k" = "amd64"; then | ||
1353 | 15316 | |||
1354 | 15317 | IS_64="-m64" | ||
1355 | 15318 | LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}" | ||
1356 | 15319 | |||
1357 | 15320 | fi | ||
1358 | 15321 | |||
1359 | 15322 | |||
1360 | 15323 | fi | ||
1361 | 15324 | |||
1362 | 15325 | |||
1363 | 15326 | CFLAGS="-g -xO4 -xlibmil -xdepend -Xa -mt -xstrconst ${IS_64} ${MEMALIGN_FLAGS} $CFLAGS" | ||
1364 | 15327 | CXXFLAGS="-g -xO4 -xlibmil -mt ${IS_64} ${MEMALIGN_FLAGS} -xlang=c99 -compat=5 -library=stlport4 -template=no%extdef $CXXFLAGS" | ||
1365 | 15328 | |||
1366 | 15329 | fi | ||
1367 | 15330 | |||
1368 | 15331 | |||
1369 | 15332 | 15481 | ||
1370 | 15333 | # Checks for header files. | 15482 | # Checks for header files. |
1371 | 15334 | { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | 15483 | { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 |
1372 | @@ -17039,10 +17188,13 @@ | |||
1373 | 17039 | fi | 17188 | fi |
1374 | 17040 | 17189 | ||
1375 | 17041 | 17190 | ||
1376 | 17191 | # HACK: Make gtest's configure script pick up our copy of CXXFLAGS, since the | ||
1377 | 17192 | # flags added by ACX_CHECK_SUNCC must be used when compiling gtest too. | ||
1378 | 17193 | export CXXFLAGS | ||
1379 | 17042 | subdirs="$subdirs gtest" | 17194 | subdirs="$subdirs gtest" |
1380 | 17043 | 17195 | ||
1381 | 17044 | 17196 | ||
1383 | 17045 | ac_config_files="$ac_config_files Makefile src/Makefile" | 17197 | ac_config_files="$ac_config_files Makefile src/Makefile protobuf.pc protobuf-lite.pc" |
1384 | 17046 | 17198 | ||
1385 | 17047 | cat >confcache <<\_ACEOF | 17199 | cat >confcache <<\_ACEOF |
1386 | 17048 | # This file is a shell script that caches the results of configure | 17200 | # This file is a shell script that caches the results of configure |
1387 | @@ -17161,13 +17313,6 @@ | |||
1388 | 17161 | Usually this means the macro was only invoked conditionally." >&2;} | 17313 | Usually this means the macro was only invoked conditionally." >&2;} |
1389 | 17162 | { (exit 1); exit 1; }; } | 17314 | { (exit 1); exit 1; }; } |
1390 | 17163 | fi | 17315 | fi |
1391 | 17164 | if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then | ||
1392 | 17165 | { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. | ||
1393 | 17166 | Usually this means the macro was only invoked conditionally." >&5 | ||
1394 | 17167 | echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. | ||
1395 | 17168 | Usually this means the macro was only invoked conditionally." >&2;} | ||
1396 | 17169 | { (exit 1); exit 1; }; } | ||
1397 | 17170 | fi | ||
1398 | 17171 | if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then | 17316 | if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then |
1399 | 17172 | { { echo "$as_me:$LINENO: error: conditional \"GCC\" was never defined. | 17317 | { { echo "$as_me:$LINENO: error: conditional \"GCC\" was never defined. |
1400 | 17173 | Usually this means the macro was only invoked conditionally." >&5 | 17318 | Usually this means the macro was only invoked conditionally." >&5 |
1401 | @@ -17175,6 +17320,13 @@ | |||
1402 | 17175 | Usually this means the macro was only invoked conditionally." >&2;} | 17320 | Usually this means the macro was only invoked conditionally." >&2;} |
1403 | 17176 | { (exit 1); exit 1; }; } | 17321 | { (exit 1); exit 1; }; } |
1404 | 17177 | fi | 17322 | fi |
1405 | 17323 | if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then | ||
1406 | 17324 | { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. | ||
1407 | 17325 | Usually this means the macro was only invoked conditionally." >&5 | ||
1408 | 17326 | echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. | ||
1409 | 17327 | Usually this means the macro was only invoked conditionally." >&2;} | ||
1410 | 17328 | { (exit 1); exit 1; }; } | ||
1411 | 17329 | fi | ||
1412 | 17178 | if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then | 17330 | if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then |
1413 | 17179 | { { echo "$as_me:$LINENO: error: conditional \"HAVE_ZLIB\" was never defined. | 17331 | { { echo "$as_me:$LINENO: error: conditional \"HAVE_ZLIB\" was never defined. |
1414 | 17180 | Usually this means the macro was only invoked conditionally." >&5 | 17332 | Usually this means the macro was only invoked conditionally." >&5 |
1415 | @@ -17489,7 +17641,7 @@ | |||
1416 | 17489 | # report actual input values of CONFIG_FILES etc. instead of their | 17641 | # report actual input values of CONFIG_FILES etc. instead of their |
1417 | 17490 | # values after options handling. | 17642 | # values after options handling. |
1418 | 17491 | ac_log=" | 17643 | ac_log=" |
1420 | 17492 | This file was extended by Protocol Buffers $as_me 2.1.0, which was | 17644 | This file was extended by Protocol Buffers $as_me 2.2.0a, which was |
1421 | 17493 | generated by GNU Autoconf 2.61. Invocation command line was | 17645 | generated by GNU Autoconf 2.61. Invocation command line was |
1422 | 17494 | 17646 | ||
1423 | 17495 | CONFIG_FILES = $CONFIG_FILES | 17647 | CONFIG_FILES = $CONFIG_FILES |
1424 | @@ -17542,7 +17694,7 @@ | |||
1425 | 17542 | _ACEOF | 17694 | _ACEOF |
1426 | 17543 | cat >>$CONFIG_STATUS <<_ACEOF | 17695 | cat >>$CONFIG_STATUS <<_ACEOF |
1427 | 17544 | ac_cs_version="\\ | 17696 | ac_cs_version="\\ |
1429 | 17545 | Protocol Buffers config.status 2.1.0 | 17697 | Protocol Buffers config.status 2.2.0a |
1430 | 17546 | configured by $0, generated by GNU Autoconf 2.61, | 17698 | configured by $0, generated by GNU Autoconf 2.61, |
1431 | 17547 | with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | 17699 | with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |
1432 | 17548 | 17700 | ||
1433 | @@ -18010,6 +18162,8 @@ | |||
1434 | 18010 | "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; | 18162 | "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; |
1435 | 18011 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 18163 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
1436 | 18012 | "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; | 18164 | "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; |
1437 | 18165 | "protobuf.pc") CONFIG_FILES="$CONFIG_FILES protobuf.pc" ;; | ||
1438 | 18166 | "protobuf-lite.pc") CONFIG_FILES="$CONFIG_FILES protobuf-lite.pc" ;; | ||
1439 | 18013 | 18167 | ||
1440 | 18014 | *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | 18168 | *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |
1441 | 18015 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | 18169 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |
1442 | @@ -18109,6 +18263,18 @@ | |||
1443 | 18109 | build_alias!$build_alias$ac_delim | 18263 | build_alias!$build_alias$ac_delim |
1444 | 18110 | host_alias!$host_alias$ac_delim | 18264 | host_alias!$host_alias$ac_delim |
1445 | 18111 | target_alias!$target_alias$ac_delim | 18265 | target_alias!$target_alias$ac_delim |
1446 | 18266 | build!$build$ac_delim | ||
1447 | 18267 | build_cpu!$build_cpu$ac_delim | ||
1448 | 18268 | build_vendor!$build_vendor$ac_delim | ||
1449 | 18269 | build_os!$build_os$ac_delim | ||
1450 | 18270 | host!$host$ac_delim | ||
1451 | 18271 | host_cpu!$host_cpu$ac_delim | ||
1452 | 18272 | host_vendor!$host_vendor$ac_delim | ||
1453 | 18273 | host_os!$host_os$ac_delim | ||
1454 | 18274 | target!$target$ac_delim | ||
1455 | 18275 | target_cpu!$target_cpu$ac_delim | ||
1456 | 18276 | target_vendor!$target_vendor$ac_delim | ||
1457 | 18277 | target_os!$target_os$ac_delim | ||
1458 | 18112 | INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim | 18278 | INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim |
1459 | 18113 | INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim | 18279 | INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim |
1460 | 18114 | INSTALL_DATA!$INSTALL_DATA$ac_delim | 18280 | INSTALL_DATA!$INSTALL_DATA$ac_delim |
1461 | @@ -18156,60 +18322,56 @@ | |||
1462 | 18156 | CXXCPP!$CXXCPP$ac_delim | 18322 | CXXCPP!$CXXCPP$ac_delim |
1463 | 18157 | GREP!$GREP$ac_delim | 18323 | GREP!$GREP$ac_delim |
1464 | 18158 | EGREP!$EGREP$ac_delim | 18324 | EGREP!$EGREP$ac_delim |
1465 | 18325 | GCC_TRUE!$GCC_TRUE$ac_delim | ||
1466 | 18326 | _ACEOF | ||
1467 | 18327 | |||
1468 | 18328 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | ||
1469 | 18329 | break | ||
1470 | 18330 | elif $ac_last_try; then | ||
1471 | 18331 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
1472 | 18332 | echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
1473 | 18333 | { (exit 1); exit 1; }; } | ||
1474 | 18334 | else | ||
1475 | 18335 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
1476 | 18336 | fi | ||
1477 | 18337 | done | ||
1478 | 18338 | |||
1479 | 18339 | ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
1480 | 18340 | if test -n "$ac_eof"; then | ||
1481 | 18341 | ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
1482 | 18342 | ac_eof=`expr $ac_eof + 1` | ||
1483 | 18343 | fi | ||
1484 | 18344 | |||
1485 | 18345 | cat >>$CONFIG_STATUS <<_ACEOF | ||
1486 | 18346 | cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof | ||
1487 | 18347 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
1488 | 18348 | _ACEOF | ||
1489 | 18349 | sed ' | ||
1490 | 18350 | s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
1491 | 18351 | s/^/s,@/; s/!/@,|#_!!_#|/ | ||
1492 | 18352 | :n | ||
1493 | 18353 | t n | ||
1494 | 18354 | s/'"$ac_delim"'$/,g/; t | ||
1495 | 18355 | s/$/\\/; p | ||
1496 | 18356 | N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
1497 | 18357 | ' >>$CONFIG_STATUS <conf$$subs.sed | ||
1498 | 18358 | rm -f conf$$subs.sed | ||
1499 | 18359 | cat >>$CONFIG_STATUS <<_ACEOF | ||
1500 | 18360 | CEOF$ac_eof | ||
1501 | 18361 | _ACEOF | ||
1502 | 18362 | |||
1503 | 18363 | |||
1504 | 18364 | ac_delim='%!_!# ' | ||
1505 | 18365 | for ac_last_try in false false false false false :; do | ||
1506 | 18366 | cat >conf$$subs.sed <<_ACEOF | ||
1507 | 18367 | GCC_FALSE!$GCC_FALSE$ac_delim | ||
1508 | 18368 | PROTOBUF_OPT_FLAG!$PROTOBUF_OPT_FLAG$ac_delim | ||
1509 | 18369 | ISAINFO!$ISAINFO$ac_delim | ||
1510 | 18159 | LIBTOOL!$LIBTOOL$ac_delim | 18370 | LIBTOOL!$LIBTOOL$ac_delim |
1511 | 18160 | build!$build$ac_delim | ||
1512 | 18161 | build_cpu!$build_cpu$ac_delim | ||
1513 | 18162 | build_vendor!$build_vendor$ac_delim | ||
1514 | 18163 | build_os!$build_os$ac_delim | ||
1515 | 18164 | host!$host$ac_delim | ||
1516 | 18165 | host_cpu!$host_cpu$ac_delim | ||
1517 | 18166 | host_vendor!$host_vendor$ac_delim | ||
1518 | 18167 | host_os!$host_os$ac_delim | ||
1519 | 18168 | SED!$SED$ac_delim | 18371 | SED!$SED$ac_delim |
1520 | 18169 | FGREP!$FGREP$ac_delim | 18372 | FGREP!$FGREP$ac_delim |
1521 | 18170 | LD!$LD$ac_delim | 18373 | LD!$LD$ac_delim |
1522 | 18171 | DUMPBIN!$DUMPBIN$ac_delim | 18374 | DUMPBIN!$DUMPBIN$ac_delim |
1523 | 18172 | _ACEOF | ||
1524 | 18173 | |||
1525 | 18174 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | ||
1526 | 18175 | break | ||
1527 | 18176 | elif $ac_last_try; then | ||
1528 | 18177 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | ||
1529 | 18178 | echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | ||
1530 | 18179 | { (exit 1); exit 1; }; } | ||
1531 | 18180 | else | ||
1532 | 18181 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | ||
1533 | 18182 | fi | ||
1534 | 18183 | done | ||
1535 | 18184 | |||
1536 | 18185 | ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | ||
1537 | 18186 | if test -n "$ac_eof"; then | ||
1538 | 18187 | ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | ||
1539 | 18188 | ac_eof=`expr $ac_eof + 1` | ||
1540 | 18189 | fi | ||
1541 | 18190 | |||
1542 | 18191 | cat >>$CONFIG_STATUS <<_ACEOF | ||
1543 | 18192 | cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof | ||
1544 | 18193 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | ||
1545 | 18194 | _ACEOF | ||
1546 | 18195 | sed ' | ||
1547 | 18196 | s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | ||
1548 | 18197 | s/^/s,@/; s/!/@,|#_!!_#|/ | ||
1549 | 18198 | :n | ||
1550 | 18199 | t n | ||
1551 | 18200 | s/'"$ac_delim"'$/,g/; t | ||
1552 | 18201 | s/$/\\/; p | ||
1553 | 18202 | N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | ||
1554 | 18203 | ' >>$CONFIG_STATUS <conf$$subs.sed | ||
1555 | 18204 | rm -f conf$$subs.sed | ||
1556 | 18205 | cat >>$CONFIG_STATUS <<_ACEOF | ||
1557 | 18206 | CEOF$ac_eof | ||
1558 | 18207 | _ACEOF | ||
1559 | 18208 | |||
1560 | 18209 | |||
1561 | 18210 | ac_delim='%!_!# ' | ||
1562 | 18211 | for ac_last_try in false false false false false :; do | ||
1563 | 18212 | cat >conf$$subs.sed <<_ACEOF | ||
1564 | 18213 | ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim | 18375 | ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim |
1565 | 18214 | NM!$NM$ac_delim | 18376 | NM!$NM$ac_delim |
1566 | 18215 | LN_S!$LN_S$ac_delim | 18377 | LN_S!$LN_S$ac_delim |
1567 | @@ -18221,9 +18383,6 @@ | |||
1568 | 18221 | LIPO!$LIPO$ac_delim | 18383 | LIPO!$LIPO$ac_delim |
1569 | 18222 | OTOOL!$OTOOL$ac_delim | 18384 | OTOOL!$OTOOL$ac_delim |
1570 | 18223 | OTOOL64!$OTOOL64$ac_delim | 18385 | OTOOL64!$OTOOL64$ac_delim |
1571 | 18224 | GCC_TRUE!$GCC_TRUE$ac_delim | ||
1572 | 18225 | GCC_FALSE!$GCC_FALSE$ac_delim | ||
1573 | 18226 | PROTOBUF_OPT_FLAG!$PROTOBUF_OPT_FLAG$ac_delim | ||
1574 | 18227 | LIBOBJS!$LIBOBJS$ac_delim | 18386 | LIBOBJS!$LIBOBJS$ac_delim |
1575 | 18228 | POW_LIB!$POW_LIB$ac_delim | 18387 | POW_LIB!$POW_LIB$ac_delim |
1576 | 18229 | HAVE_ZLIB_TRUE!$HAVE_ZLIB_TRUE$ac_delim | 18388 | HAVE_ZLIB_TRUE!$HAVE_ZLIB_TRUE$ac_delim |
1577 | @@ -18239,7 +18398,7 @@ | |||
1578 | 18239 | LTLIBOBJS!$LTLIBOBJS$ac_delim | 18398 | LTLIBOBJS!$LTLIBOBJS$ac_delim |
1579 | 18240 | _ACEOF | 18399 | _ACEOF |
1580 | 18241 | 18400 | ||
1582 | 18242 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then | 18401 | if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then |
1583 | 18243 | break | 18402 | break |
1584 | 18244 | elif $ac_last_try; then | 18403 | elif $ac_last_try; then |
1585 | 18245 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | 18404 | { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
1586 | 18246 | 18405 | ||
1587 | === modified file 'configure.ac' | |||
1588 | --- configure.ac 2009-06-24 00:19:03 +0000 | |||
1589 | +++ configure.ac 2010-01-18 04:34:17 +0000 | |||
1590 | @@ -12,17 +12,22 @@ | |||
1591 | 12 | # In the SVN trunk, the version should always be the next anticipated release | 12 | # In the SVN trunk, the version should always be the next anticipated release |
1592 | 13 | # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed | 13 | # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed |
1593 | 14 | # the size of one file name in the dist tarfile over the 99-char limit.) | 14 | # the size of one file name in the dist tarfile over the 99-char limit.) |
1595 | 15 | AC_INIT([Protocol Buffers],[2.1.0],[protobuf@googlegroups.com],[protobuf]) | 15 | AC_INIT([Protocol Buffers],[2.2.0a],[protobuf@googlegroups.com],[protobuf]) |
1596 | 16 | 16 | ||
1597 | 17 | # Detect whether the user specified their own compilation flags. If so then | ||
1598 | 18 | # we want to respect their decision, otherwise we will twiddle them later. | ||
1599 | 19 | AS_IF([test "$CXXFLAGS" = ""],[ | ||
1600 | 20 | protobuf_default_cxxflags=yes | ||
1601 | 21 | ]) | ||
1602 | 22 | 17 | ||
1603 | 23 | AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) | 18 | AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) |
1604 | 24 | AC_CONFIG_HEADERS([config.h]) | 19 | AC_CONFIG_HEADERS([config.h]) |
1605 | 25 | AC_CONFIG_MACRO_DIR([m4]) | 20 | AC_CONFIG_MACRO_DIR([m4]) |
1606 | 21 | |||
1607 | 22 | # autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily | ||
1608 | 23 | # the best choice for libprotobuf. | ||
1609 | 24 | AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"], | ||
1610 | 25 | [CFLAGS=""]) | ||
1611 | 26 | AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], | ||
1612 | 27 | [CXXFLAGS=""]) | ||
1613 | 28 | |||
1614 | 29 | AC_CANONICAL_TARGET | ||
1615 | 30 | |||
1616 | 26 | AM_INIT_AUTOMAKE | 31 | AM_INIT_AUTOMAKE |
1617 | 27 | 32 | ||
1618 | 28 | AC_ARG_WITH([zlib], | 33 | AC_ARG_WITH([zlib], |
1619 | @@ -40,26 +45,15 @@ | |||
1620 | 40 | AC_PROG_CXX | 45 | AC_PROG_CXX |
1621 | 41 | AC_LANG([C++]) | 46 | AC_LANG([C++]) |
1622 | 42 | ACX_USE_SYSTEM_EXTENSIONS | 47 | ACX_USE_SYSTEM_EXTENSIONS |
1623 | 43 | AC_PROG_LIBTOOL | ||
1624 | 44 | AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc | 48 | AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc |
1625 | 45 | 49 | ||
1628 | 46 | # autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily | 50 | # test_util.cc takes forever to compile with GCC and optimization turned on. |
1627 | 47 | # the best choice for libprotobuf. | ||
1629 | 48 | AC_MSG_CHECKING([C++ compiler flags...]) | 51 | AC_MSG_CHECKING([C++ compiler flags...]) |
1644 | 49 | AS_IF([test "$protobuf_default_cxxflags" = "yes"],[ | 52 | AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[ |
1645 | 50 | 53 | AS_IF([test "$GCC" = "yes"],[ | |
1646 | 51 | # test_util.cc takes forever to compile with GCC and optimization turned on. | 54 | PROTOBUF_OPT_FLAG="-O2" |
1647 | 52 | # But we cannot override anything that is part of CXXFLAGS since it is the | 55 | CXXFLAGS="${CXXFLAGS} -g" |
1648 | 53 | # last thing added to the command line. The automake docs insist that you | 56 | ]) |
1635 | 54 | # should never want to override CXXFLAGS because they represent the intent of | ||
1636 | 55 | # the user, and the user knows best. But if the user actually did not set | ||
1637 | 56 | # any CXXFLAGS, then AC_PROG_CXX sets them to a rather arbitrary default. | ||
1638 | 57 | # That's not user intent at all, but automake still treats it like it is. | ||
1639 | 58 | # Grr. Anyway, getting back to the point, this hack here strips out the -O | ||
1640 | 59 | # flag from autoconf's defaults and puts it into another variable so that | ||
1641 | 60 | # we can override it. BTW, m4 escaping sucks. | ||
1642 | 61 | PROTOBUF_OPT_FLAG=`echo "$CXXFLAGS" | grep -o '\-O@<:@0-9@:>@\?'` | ||
1643 | 62 | CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ \?-O@<:@0-9@:>@\?//g'` | ||
1649 | 63 | 57 | ||
1650 | 64 | # Protocol Buffers contains several checks that are intended to be used only | 58 | # Protocol Buffers contains several checks that are intended to be used only |
1651 | 65 | # for debugging and which might hurt performance. Most users are probably | 59 | # for debugging and which might hurt performance. Most users are probably |
1652 | @@ -68,7 +62,6 @@ | |||
1653 | 68 | 62 | ||
1654 | 69 | AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS]) | 63 | AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS]) |
1655 | 70 | ],[ | 64 | ],[ |
1656 | 71 | PROTOBUF_OPT_FLAG= | ||
1657 | 72 | AC_MSG_RESULT([use user-supplied: $CXXFLAGS]) | 65 | AC_MSG_RESULT([use user-supplied: $CXXFLAGS]) |
1658 | 73 | ]) | 66 | ]) |
1659 | 74 | 67 | ||
1660 | @@ -76,6 +69,10 @@ | |||
1661 | 76 | 69 | ||
1662 | 77 | ACX_CHECK_SUNCC | 70 | ACX_CHECK_SUNCC |
1663 | 78 | 71 | ||
1664 | 72 | # Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd | ||
1665 | 73 | # to the link | ||
1666 | 74 | AC_PROG_LIBTOOL | ||
1667 | 75 | |||
1668 | 79 | # Checks for header files. | 76 | # Checks for header files. |
1669 | 80 | AC_HEADER_STDC | 77 | AC_HEADER_STDC |
1670 | 81 | AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h]) | 78 | AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h]) |
1671 | @@ -117,7 +114,10 @@ | |||
1672 | 117 | ACX_PTHREAD | 114 | ACX_PTHREAD |
1673 | 118 | AC_CXX_STL_HASH | 115 | AC_CXX_STL_HASH |
1674 | 119 | 116 | ||
1675 | 117 | # HACK: Make gtest's configure script pick up our copy of CXXFLAGS, since the | ||
1676 | 118 | # flags added by ACX_CHECK_SUNCC must be used when compiling gtest too. | ||
1677 | 119 | export CXXFLAGS | ||
1678 | 120 | AC_CONFIG_SUBDIRS([gtest]) | 120 | AC_CONFIG_SUBDIRS([gtest]) |
1679 | 121 | 121 | ||
1681 | 122 | AC_CONFIG_FILES([Makefile src/Makefile ]) | 122 | AC_CONFIG_FILES([Makefile src/Makefile protobuf.pc protobuf-lite.pc]) |
1682 | 123 | AC_OUTPUT | 123 | AC_OUTPUT |
1683 | 124 | 124 | ||
1684 | === modified file 'debian/changelog' | |||
1685 | --- debian/changelog 2009-11-16 10:41:33 +0000 | |||
1686 | +++ debian/changelog 2010-01-18 04:34:17 +0000 | |||
1687 | @@ -1,3 +1,39 @@ | |||
1688 | 1 | protobuf (2.2.0a-0.1ubuntu1) lucid; urgency=low | ||
1689 | 2 | |||
1690 | 3 | * Merge from Debian (LP: #502654) | ||
1691 | 4 | * Remaining Ubuntu changes: | ||
1692 | 5 | - Disable the death tests on IA64, now as a quilt patch. | ||
1693 | 6 | - Don't hardcode python2.4, also as a quilt patch. | ||
1694 | 7 | |||
1695 | 8 | -- Elliot Murphy <elliot@ubuntu.com> Sun, 17 Jan 2010 23:21:58 -0500 | ||
1696 | 9 | |||
1697 | 10 | protobuf (2.2.0a-0.1) unstable; urgency=low | ||
1698 | 11 | |||
1699 | 12 | * Non-maintainer upload | ||
1700 | 13 | * New upstream release made this evening correction major SONAME | ||
1701 | 14 | * debian/control: Updated major version to 5 (Closes: #556563) | ||
1702 | 15 | * debian/rules: Updated two links to use libproto*5 | ||
1703 | 16 | * debian/libprotobuf5.shlibs: Added | ||
1704 | 17 | * debian/libprotoc5.shlibs: Added | ||
1705 | 18 | |||
1706 | 19 | -- Dirk Eddelbuettel <edd@debian.org> Wed, 18 Nov 2009 21:47:41 -0600 | ||
1707 | 20 | |||
1708 | 21 | protobuf (2.2.0-0.1) unstable; urgency=low | ||
1709 | 22 | |||
1710 | 23 | * Non-maintainer upload coordinated with maintainer | ||
1711 | 24 | * New upstream release (Closes: #551931) | ||
1712 | 25 | |||
1713 | 26 | * debian/libprotobuf-install: Added 'usr/lib/pkgconfig/*' to have | ||
1714 | 27 | pkg-config support files installed | ||
1715 | 28 | |||
1716 | 29 | * debian/control: Added (= ${binary:Version}) to Depends for -dev | ||
1717 | 30 | packages for tighter link to underlying libraries [lintian warning] | ||
1718 | 31 | * debian/control: Updated StandardVersion: to 3.8.3 | ||
1719 | 32 | |||
1720 | 33 | * debian/control: Major version not incremented as upstream kept it at 4 | ||
1721 | 34 | |||
1722 | 35 | -- Dirk Eddelbuettel <edd@debian.org> Sat, 14 Nov 2009 06:44:22 -0600 | ||
1723 | 36 | |||
1724 | 1 | protobuf (2.1.0-1ubuntu1) lucid; urgency=low | 37 | protobuf (2.1.0-1ubuntu1) lucid; urgency=low |
1725 | 2 | 38 | ||
1726 | 3 | * Merge from Debian testing. | 39 | * Merge from Debian testing. |
1727 | 4 | 40 | ||
1728 | === modified file 'debian/control' | |||
1729 | --- debian/control 2009-11-16 10:41:33 +0000 | |||
1730 | +++ debian/control 2010-01-18 04:34:17 +0000 | |||
1731 | @@ -5,12 +5,12 @@ | |||
1732 | 5 | XSBC-Original-Maintainer: Iustin Pop <iusty@k1024.org> | 5 | XSBC-Original-Maintainer: Iustin Pop <iusty@k1024.org> |
1733 | 6 | Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-setuptools (>= 0.6c8), xmlto, ant, quilt, zlib1g-dev | 6 | Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-setuptools (>= 0.6c8), xmlto, ant, quilt, zlib1g-dev |
1734 | 7 | Build-Depends-Indep: python-support (>= 0.6), openjdk-6-jdk | 7 | Build-Depends-Indep: python-support (>= 0.6), openjdk-6-jdk |
1736 | 8 | Standards-Version: 3.8.2 | 8 | Standards-Version: 3.8.3 |
1737 | 9 | Homepage: http://code.google.com/p/protobuf/ | 9 | Homepage: http://code.google.com/p/protobuf/ |
1738 | 10 | Vcs-Browser: http://git.debian.org/?p=collab-maint/protobuf.git | 10 | Vcs-Browser: http://git.debian.org/?p=collab-maint/protobuf.git |
1739 | 11 | Vcs-Git: git://git.debian.org/git/collab-maint/protobuf.git | 11 | Vcs-Git: git://git.debian.org/git/collab-maint/protobuf.git |
1740 | 12 | 12 | ||
1742 | 13 | Package: libprotobuf4 | 13 | Package: libprotobuf5 |
1743 | 14 | Architecture: any | 14 | Architecture: any |
1744 | 15 | Depends: ${shlibs:Depends}, ${misc:Depends} | 15 | Depends: ${shlibs:Depends}, ${misc:Depends} |
1745 | 16 | Description: protocol buffers C++ library | 16 | Description: protocol buffers C++ library |
1746 | @@ -30,7 +30,7 @@ | |||
1747 | 30 | Package: libprotobuf-dev | 30 | Package: libprotobuf-dev |
1748 | 31 | Architecture: any | 31 | Architecture: any |
1749 | 32 | Section: libdevel | 32 | Section: libdevel |
1751 | 33 | Depends: ${shlibs:Depends}, ${misc:Depends}, libprotobuf4 | 33 | Depends: ${shlibs:Depends}, ${misc:Depends}, libprotobuf5 (= ${binary:Version}) |
1752 | 34 | Description: protocol buffers C++ library (development headers) | 34 | Description: protocol buffers C++ library (development headers) |
1753 | 35 | Protocol buffers are a flexible, efficient, automated mechanism for | 35 | Protocol buffers are a flexible, efficient, automated mechanism for |
1754 | 36 | serializing structured data - similar to XML, but smaller, faster, and | 36 | serializing structured data - similar to XML, but smaller, faster, and |
1755 | @@ -46,7 +46,7 @@ | |||
1756 | 46 | This package contains the development libraries needed for writing C++ | 46 | This package contains the development libraries needed for writing C++ |
1757 | 47 | applications. | 47 | applications. |
1758 | 48 | 48 | ||
1760 | 49 | Package: libprotoc4 | 49 | Package: libprotoc5 |
1761 | 50 | Architecture: any | 50 | Architecture: any |
1762 | 51 | Depends: ${shlibs:Depends}, ${misc:Depends} | 51 | Depends: ${shlibs:Depends}, ${misc:Depends} |
1763 | 52 | Description: protocol buffers compiler library | 52 | Description: protocol buffers compiler library |
1764 | @@ -67,7 +67,7 @@ | |||
1765 | 67 | Package: libprotoc-dev | 67 | Package: libprotoc-dev |
1766 | 68 | Architecture: any | 68 | Architecture: any |
1767 | 69 | Section: libdevel | 69 | Section: libdevel |
1769 | 70 | Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc4, libprotobuf-dev | 70 | Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc5 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version}) |
1770 | 71 | Replaces: libprotobuf-dev (<< 2.1.0) | 71 | Replaces: libprotobuf-dev (<< 2.1.0) |
1771 | 72 | Conflicts: libprotobuf-dev (<< 2.1.0) | 72 | Conflicts: libprotobuf-dev (<< 2.1.0) |
1772 | 73 | Description: protocol buffers compiler library (development headers) | 73 | Description: protocol buffers compiler library (development headers) |
1773 | @@ -87,7 +87,7 @@ | |||
1774 | 87 | 87 | ||
1775 | 88 | Package: protobuf-compiler | 88 | Package: protobuf-compiler |
1776 | 89 | Architecture: any | 89 | Architecture: any |
1778 | 90 | Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc4 (= ${binary:Version}) | 90 | Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc5 (= ${binary:Version}) |
1779 | 91 | Description: compiler for protocol buffer definition files | 91 | Description: compiler for protocol buffer definition files |
1780 | 92 | Protocol buffers are a flexible, efficient, automated mechanism for | 92 | Protocol buffers are a flexible, efficient, automated mechanism for |
1781 | 93 | serializing structured data - similar to XML, but smaller, faster, and | 93 | serializing structured data - similar to XML, but smaller, faster, and |
1782 | 94 | 94 | ||
1783 | === modified file 'debian/java-build.xml' | |||
1784 | --- debian/java-build.xml 2009-11-16 10:41:33 +0000 | |||
1785 | +++ debian/java-build.xml 2010-01-18 04:34:16 +0000 | |||
1786 | @@ -28,6 +28,6 @@ | |||
1787 | 28 | </target> | 28 | </target> |
1788 | 29 | 29 | ||
1789 | 30 | <target name="jar" depends="compile"> | 30 | <target name="jar" depends="compile"> |
1791 | 31 | <jar destfile="${targetdir}/protobuf-2.1.0.jar" basedir="${classesdir}" /> | 31 | <jar destfile="${targetdir}/protobuf-2.2.0.jar" basedir="${classesdir}" /> |
1792 | 32 | </target> | 32 | </target> |
1793 | 33 | </project> | 33 | </project> |
1794 | 34 | 34 | ||
1795 | === modified file 'debian/libprotobuf-dev.install' | |||
1796 | --- debian/libprotobuf-dev.install 2009-06-24 00:19:03 +0000 | |||
1797 | +++ debian/libprotobuf-dev.install 2010-01-18 04:34:17 +0000 | |||
1798 | @@ -1,3 +1,4 @@ | |||
1799 | 1 | usr/lib/libprotobuf.so | 1 | usr/lib/libprotobuf.so |
1800 | 2 | usr/lib/libprotobuf.la | 2 | usr/lib/libprotobuf.la |
1801 | 3 | usr/lib/pkgconfig/* | ||
1802 | 3 | usr/include | 4 | usr/include |
1803 | 4 | 5 | ||
1804 | === modified file 'debian/libprotobuf-java.links' | |||
1805 | --- debian/libprotobuf-java.links 2009-11-16 10:41:33 +0000 | |||
1806 | +++ debian/libprotobuf-java.links 2010-01-18 04:34:17 +0000 | |||
1807 | @@ -1,1 +1,1 @@ | |||
1809 | 1 | usr/share/java/protobuf-2.1.0.jar usr/share/java/protobuf.jar | 1 | usr/share/java/protobuf-2.2.0.jar usr/share/java/protobuf.jar |
1810 | 2 | 2 | ||
1811 | === removed file 'debian/libprotobuf4.install' | |||
1812 | --- debian/libprotobuf4.install 2009-06-24 00:19:03 +0000 | |||
1813 | +++ debian/libprotobuf4.install 1970-01-01 00:00:00 +0000 | |||
1814 | @@ -1,1 +0,0 @@ | |||
1815 | 1 | usr/lib/libprotobuf*.so.* | ||
1816 | 2 | 0 | ||
1817 | === added file 'debian/libprotobuf5.install' | |||
1818 | --- debian/libprotobuf5.install 1970-01-01 00:00:00 +0000 | |||
1819 | +++ debian/libprotobuf5.install 2010-01-18 04:34:16 +0000 | |||
1820 | @@ -0,0 +1,1 @@ | |||
1821 | 1 | usr/lib/libprotobuf*.so.* | ||
1822 | 0 | 2 | ||
1823 | === added file 'debian/libprotobuf5.shlibs' | |||
1824 | --- debian/libprotobuf5.shlibs 1970-01-01 00:00:00 +0000 | |||
1825 | +++ debian/libprotobuf5.shlibs 2010-01-18 04:34:17 +0000 | |||
1826 | @@ -0,0 +1,3 @@ | |||
1827 | 1 | libprotobuf 5 libprotobuf5 | ||
1828 | 2 | libprotobuf-lite 5 libprotobuf5 | ||
1829 | 3 | |||
1830 | 0 | 4 | ||
1831 | === added file 'debian/libprotoc-dev.dirs' | |||
1832 | --- debian/libprotoc-dev.dirs 1970-01-01 00:00:00 +0000 | |||
1833 | +++ debian/libprotoc-dev.dirs 2010-01-18 04:34:17 +0000 | |||
1834 | @@ -0,0 +1,1 @@ | |||
1835 | 1 | usr/share/doc | ||
1836 | 0 | 2 | ||
1837 | === removed file 'debian/libprotoc-dev.dirs' | |||
1838 | --- debian/libprotoc-dev.dirs 2009-06-24 00:19:03 +0000 | |||
1839 | +++ debian/libprotoc-dev.dirs 1970-01-01 00:00:00 +0000 | |||
1840 | @@ -1,1 +0,0 @@ | |||
1841 | 1 | usr/share/doc | ||
1842 | 2 | 0 | ||
1843 | === added file 'debian/libprotoc-dev.install' | |||
1844 | --- debian/libprotoc-dev.install 1970-01-01 00:00:00 +0000 | |||
1845 | +++ debian/libprotoc-dev.install 2010-01-18 04:34:16 +0000 | |||
1846 | @@ -0,0 +1,3 @@ | |||
1847 | 1 | usr/lib/libprotoc.so | ||
1848 | 2 | usr/lib/libprotoc.la | ||
1849 | 3 | usr/include/google/protobuf/compiler | ||
1850 | 0 | 4 | ||
1851 | === removed file 'debian/libprotoc-dev.install' | |||
1852 | --- debian/libprotoc-dev.install 2009-06-24 00:19:03 +0000 | |||
1853 | +++ debian/libprotoc-dev.install 1970-01-01 00:00:00 +0000 | |||
1854 | @@ -1,3 +0,0 @@ | |||
1855 | 1 | usr/lib/libprotoc.so | ||
1856 | 2 | usr/lib/libprotoc.la | ||
1857 | 3 | usr/include/google/protobuf/compiler | ||
1858 | 4 | 0 | ||
1859 | === removed file 'debian/libprotoc4.install' | |||
1860 | --- debian/libprotoc4.install 2009-06-24 00:19:03 +0000 | |||
1861 | +++ debian/libprotoc4.install 1970-01-01 00:00:00 +0000 | |||
1862 | @@ -1,1 +0,0 @@ | |||
1863 | 1 | usr/lib/libprotoc*.so.* | ||
1864 | 2 | 0 | ||
1865 | === added file 'debian/libprotoc5.install' | |||
1866 | --- debian/libprotoc5.install 1970-01-01 00:00:00 +0000 | |||
1867 | +++ debian/libprotoc5.install 2010-01-18 04:34:17 +0000 | |||
1868 | @@ -0,0 +1,1 @@ | |||
1869 | 1 | usr/lib/libprotoc*.so.* | ||
1870 | 0 | 2 | ||
1871 | === added file 'debian/libprotoc5.shlibs' | |||
1872 | --- debian/libprotoc5.shlibs 1970-01-01 00:00:00 +0000 | |||
1873 | +++ debian/libprotoc5.shlibs 2010-01-18 04:34:17 +0000 | |||
1874 | @@ -0,0 +1,1 @@ | |||
1875 | 1 | libprotoc 5 libprotoc5 | ||
1876 | 0 | 2 | ||
1877 | === added directory 'debian/patches' | |||
1878 | === removed directory 'debian/patches' | |||
1879 | === renamed file 'debian/patches/default_python_version' => 'debian/patches/default_python_version' | |||
1880 | === renamed file 'debian/patches/no_death_tests_on_ia64' => 'debian/patches/no_death_tests_on_ia64' | |||
1881 | === added file 'debian/patches/series' | |||
1882 | --- debian/patches/series 1970-01-01 00:00:00 +0000 | |||
1883 | +++ debian/patches/series 2010-01-18 04:34:16 +0000 | |||
1884 | @@ -0,0 +1,3 @@ | |||
1885 | 1 | # comment to keep empty file in the diff.gz | ||
1886 | 2 | no_death_tests_on_ia64 | ||
1887 | 3 | default_python_version | ||
1888 | 0 | 4 | ||
1889 | === removed file 'debian/patches/series' | |||
1890 | --- debian/patches/series 2009-11-16 10:41:33 +0000 | |||
1891 | +++ debian/patches/series 1970-01-01 00:00:00 +0000 | |||
1892 | @@ -1,3 +0,0 @@ | |||
1893 | 1 | # comment to keep empty file in the diff.gz | ||
1894 | 2 | no_death_tests_on_ia64 | ||
1895 | 3 | default_python_version | ||
1896 | 4 | 0 | ||
1897 | === modified file 'debian/rules' | |||
1898 | --- debian/rules 2009-11-16 10:41:33 +0000 | |||
1899 | +++ debian/rules 2010-01-18 04:34:17 +0000 | |||
1900 | @@ -90,9 +90,11 @@ | |||
1901 | 90 | # remove the built manpage | 90 | # remove the built manpage |
1902 | 91 | rm -f protoc.1 | 91 | rm -f protoc.1 |
1903 | 92 | 92 | ||
1907 | 93 | cd python && \ | 93 | if [ -f python/protobuf.egg-info ]; then \ |
1908 | 94 | python setup.py clean --all ;\ | 94 | ( cd python && \ |
1909 | 95 | rm -rf protobuf.egg-info | 95 | python setup.py clean --all && \ |
1910 | 96 | rm -rf protobuf.egg-info ) \ | ||
1911 | 97 | fi | ||
1912 | 96 | 98 | ||
1913 | 97 | # remove java builds | 99 | # remove java builds |
1914 | 98 | $(SHELL) ./debian/ant-wrapper -f debian/java-build.xml clean || true | 100 | $(SHELL) ./debian/ant-wrapper -f debian/java-build.xml clean || true |
1915 | @@ -130,9 +132,9 @@ | |||
1916 | 130 | 132 | ||
1917 | 131 | # convert doc dir to symlink for the dev packages | 133 | # convert doc dir to symlink for the dev packages |
1918 | 132 | rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev | 134 | rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev |
1920 | 133 | ln -s libprotobuf4 $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev | 135 | ln -s libprotobuf5 $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev |
1921 | 134 | rm -rf $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev | 136 | rm -rf $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev |
1923 | 135 | ln -s libprotoc4 $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev | 137 | ln -s libprotoc5 $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev |
1924 | 136 | 138 | ||
1925 | 137 | # remove compiler headers from libprotobuf-dev | 139 | # remove compiler headers from libprotobuf-dev |
1926 | 138 | rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/include/google/protobuf/compiler | 140 | rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/include/google/protobuf/compiler |
1927 | 139 | 141 | ||
1928 | === added file 'editors/protobuf-mode.el' | |||
1929 | --- editors/protobuf-mode.el 1970-01-01 00:00:00 +0000 | |||
1930 | +++ editors/protobuf-mode.el 2010-01-18 04:34:16 +0000 | |||
1931 | @@ -0,0 +1,218 @@ | |||
1932 | 1 | ;;; protobuf-mode.el --- major mode for editing protocol buffers. | ||
1933 | 2 | |||
1934 | 3 | ;; Author: Alexandre Vassalotti <alexandre@peadrop.com> | ||
1935 | 4 | ;; Created: 23-Apr-2009 | ||
1936 | 5 | ;; Version: 0.3 | ||
1937 | 6 | ;; Keywords: google protobuf languages | ||
1938 | 7 | |||
1939 | 8 | ;; Redistribution and use in source and binary forms, with or without | ||
1940 | 9 | ;; modification, are permitted provided that the following conditions are | ||
1941 | 10 | ;; met: | ||
1942 | 11 | ;; | ||
1943 | 12 | ;; * Redistributions of source code must retain the above copyright | ||
1944 | 13 | ;; notice, this list of conditions and the following disclaimer. | ||
1945 | 14 | ;; * Redistributions in binary form must reproduce the above | ||
1946 | 15 | ;; copyright notice, this list of conditions and the following disclaimer | ||
1947 | 16 | ;; in the documentation and/or other materials provided with the | ||
1948 | 17 | ;; distribution. | ||
1949 | 18 | ;; * Neither the name of Google Inc. nor the names of its | ||
1950 | 19 | ;; contributors may be used to endorse or promote products derived from | ||
1951 | 20 | ;; this software without specific prior written permission. | ||
1952 | 21 | ;; | ||
1953 | 22 | ;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
1954 | 23 | ;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
1955 | 24 | ;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
1956 | 25 | ;; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
1957 | 26 | ;; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
1958 | 27 | ;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
1959 | 28 | ;; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
1960 | 29 | ;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
1961 | 30 | ;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
1962 | 31 | ;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
1963 | 32 | ;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
1964 | 33 | |||
1965 | 34 | ;;; Commentary: | ||
1966 | 35 | |||
1967 | 36 | ;; Installation: | ||
1968 | 37 | ;; - Put `protobuf-mode.el' in your Emacs load-path. | ||
1969 | 38 | ;; - Add this line to your .emacs file: | ||
1970 | 39 | ;; (require 'protobuf-mode) | ||
1971 | 40 | ;; | ||
1972 | 41 | ;; You can customize this mode just like any mode derived from CC Mode. If | ||
1973 | 42 | ;; you want to add customizations specific to protobuf-mode, you can use the | ||
1974 | 43 | ;; `protobuf-mode-hook'. For example, the following would make protocol-mode | ||
1975 | 44 | ;; use 2-space indentation: | ||
1976 | 45 | ;; | ||
1977 | 46 | ;; (defconst my-protobuf-style | ||
1978 | 47 | ;; '((c-basic-offset . 2) | ||
1979 | 48 | ;; (indent-tabs-mode . nil))) | ||
1980 | 49 | ;; | ||
1981 | 50 | ;; (add-hook 'protobuf-mode-hook | ||
1982 | 51 | ;; (lambda () (c-add-style "my-style" my-protobuf-style t))) | ||
1983 | 52 | ;; | ||
1984 | 53 | ;; Refer to the documentation of CC Mode for more information about | ||
1985 | 54 | ;; customization details and how to use this mode. | ||
1986 | 55 | ;; | ||
1987 | 56 | ;; TODO: | ||
1988 | 57 | ;; - Make highlighting for enum values work properly. | ||
1989 | 58 | ;; - Fix the parser to recognize extensions as identifiers and not | ||
1990 | 59 | ;; as casts. | ||
1991 | 60 | ;; - Improve the parsing of option assignment lists. For example: | ||
1992 | 61 | ;; optional int32 foo = 1 [(my_field_option) = 4.5]; | ||
1993 | 62 | ;; - Add support for fully-qualified identifiers (e.g., with a leading "."). | ||
1994 | 63 | |||
1995 | 64 | ;;; Code: | ||
1996 | 65 | |||
1997 | 66 | (require 'cc-mode) | ||
1998 | 67 | |||
1999 | 68 | (eval-when-compile | ||
2000 | 69 | (require 'cc-langs) | ||
2001 | 70 | (require 'cc-fonts)) | ||
2002 | 71 | |||
2003 | 72 | ;; This mode does not inherit properties from other modes. So, we do not use | ||
2004 | 73 | ;; the usual `c-add-language' function. | ||
2005 | 74 | (put 'protobuf-mode 'c-mode-prefix "protobuf-") | ||
2006 | 75 | |||
2007 | 76 | ;; The following code uses of the `c-lang-defconst' macro define syntactic | ||
2008 | 77 | ;; features of protocol buffer language. Refer to the documentation in the | ||
2009 | 78 | ;; cc-langs.el file for information about the meaning of the -kwds variables. | ||
2010 | 79 | |||
2011 | 80 | (c-lang-defconst c-primitive-type-kwds | ||
2012 | 81 | protobuf '("double" "float" "int32" "int64" "uint32" "uint64" "sint32" | ||
2013 | 82 | "sint64" "fixed32" "fixed64" "sfixed32" "sfixed64" "bool" | ||
2014 | 83 | "string" "bytes" "group")) | ||
2015 | 84 | |||
2016 | 85 | (c-lang-defconst c-modifier-kwds | ||
2017 | 86 | protobuf '("required" "optional" "repeated")) | ||
2018 | 87 | |||
2019 | 88 | (c-lang-defconst c-class-decl-kwds | ||
2020 | 89 | protobuf '("message" "enum" "service")) | ||
2021 | 90 | |||
2022 | 91 | (c-lang-defconst c-constant-kwds | ||
2023 | 92 | protobuf '("true" "false")) | ||
2024 | 93 | |||
2025 | 94 | (c-lang-defconst c-other-decl-kwds | ||
2026 | 95 | protobuf '("package" "import")) | ||
2027 | 96 | |||
2028 | 97 | (c-lang-defconst c-other-kwds | ||
2029 | 98 | protobuf '("default" "max")) | ||
2030 | 99 | |||
2031 | 100 | (c-lang-defconst c-identifier-ops | ||
2032 | 101 | ;; Handle extended identifiers like google.protobuf.MessageOptions | ||
2033 | 102 | protobuf '((left-assoc "."))) | ||
2034 | 103 | |||
2035 | 104 | ;; The following keywords do not fit well in keyword classes defined by | ||
2036 | 105 | ;; cc-mode. So, we approximate as best we can. | ||
2037 | 106 | |||
2038 | 107 | (c-lang-defconst c-type-list-kwds | ||
2039 | 108 | protobuf '("extensions" "to")) | ||
2040 | 109 | |||
2041 | 110 | (c-lang-defconst c-typeless-decl-kwds | ||
2042 | 111 | protobuf '("extend" "rpc" "option" "returns")) | ||
2043 | 112 | |||
2044 | 113 | |||
2045 | 114 | ;; Here we remove default syntax for loops, if-statements and other C | ||
2046 | 115 | ;; syntactic features that are not supported by the protocol buffer language. | ||
2047 | 116 | |||
2048 | 117 | (c-lang-defconst c-brace-list-decl-kwds | ||
2049 | 118 | ;; Remove syntax for C-style enumerations. | ||
2050 | 119 | protobuf nil) | ||
2051 | 120 | |||
2052 | 121 | (c-lang-defconst c-block-stmt-1-kwds | ||
2053 | 122 | ;; Remove syntax for "do" and "else" keywords. | ||
2054 | 123 | protobuf nil) | ||
2055 | 124 | |||
2056 | 125 | (c-lang-defconst c-block-stmt-2-kwds | ||
2057 | 126 | ;; Remove syntax for "for", "if", "switch" and "while" keywords. | ||
2058 | 127 | protobuf nil) | ||
2059 | 128 | |||
2060 | 129 | (c-lang-defconst c-simple-stmt-kwds | ||
2061 | 130 | ;; Remove syntax for "break", "continue", "goto" and "return" keywords. | ||
2062 | 131 | protobuf nil) | ||
2063 | 132 | |||
2064 | 133 | (c-lang-defconst c-paren-stmt-kwds | ||
2065 | 134 | ;; Remove special case for the "(;;)" in for-loops. | ||
2066 | 135 | protobuf nil) | ||
2067 | 136 | |||
2068 | 137 | (c-lang-defconst c-label-kwds | ||
2069 | 138 | ;; Remove case label syntax for the "case" and "default" keywords. | ||
2070 | 139 | protobuf nil) | ||
2071 | 140 | |||
2072 | 141 | (c-lang-defconst c-before-label-kwds | ||
2073 | 142 | ;; Remove special case for the label in a goto statement. | ||
2074 | 143 | protobuf nil) | ||
2075 | 144 | |||
2076 | 145 | (c-lang-defconst c-cpp-matchers | ||
2077 | 146 | ;; Disable all the C preprocessor syntax. | ||
2078 | 147 | protobuf nil) | ||
2079 | 148 | |||
2080 | 149 | (c-lang-defconst c-decl-prefix-re | ||
2081 | 150 | ;; Same as for C, except it does not match "(". This is needed for disabling | ||
2082 | 151 | ;; the syntax for casts. | ||
2083 | 152 | protobuf "\\([\{\};,]+\\)") | ||
2084 | 153 | |||
2085 | 154 | |||
2086 | 155 | ;; Add support for variable levels of syntax highlighting. | ||
2087 | 156 | |||
2088 | 157 | (defconst protobuf-font-lock-keywords-1 (c-lang-const c-matchers-1 protobuf) | ||
2089 | 158 | "Minimal highlighting for protobuf-mode.") | ||
2090 | 159 | |||
2091 | 160 | (defconst protobuf-font-lock-keywords-2 (c-lang-const c-matchers-2 protobuf) | ||
2092 | 161 | "Fast normal highlighting for protobuf-mode.") | ||
2093 | 162 | |||
2094 | 163 | (defconst protobuf-font-lock-keywords-3 (c-lang-const c-matchers-3 protobuf) | ||
2095 | 164 | "Accurate normal highlighting for protobuf-mode.") | ||
2096 | 165 | |||
2097 | 166 | (defvar protobuf-font-lock-keywords protobuf-font-lock-keywords-3 | ||
2098 | 167 | "Default expressions to highlight in protobuf-mode.") | ||
2099 | 168 | |||
2100 | 169 | ;; Our syntax table is auto-generated from the keyword classes we defined | ||
2101 | 170 | ;; previously with the `c-lang-const' macro. | ||
2102 | 171 | (defvar protobuf-mode-syntax-table nil | ||
2103 | 172 | "Syntax table used in protobuf-mode buffers.") | ||
2104 | 173 | (or protobuf-mode-syntax-table | ||
2105 | 174 | (setq protobuf-mode-syntax-table | ||
2106 | 175 | (funcall (c-lang-const c-make-mode-syntax-table protobuf)))) | ||
2107 | 176 | |||
2108 | 177 | (defvar protobuf-mode-abbrev-table nil | ||
2109 | 178 | "Abbreviation table used in protobuf-mode buffers.") | ||
2110 | 179 | |||
2111 | 180 | (defvar protobuf-mode-map nil | ||
2112 | 181 | "Keymap used in protobuf-mode buffers.") | ||
2113 | 182 | (or protobuf-mode-map | ||
2114 | 183 | (setq protobuf-mode-map (c-make-inherited-keymap))) | ||
2115 | 184 | |||
2116 | 185 | (easy-menu-define protobuf-menu protobuf-mode-map | ||
2117 | 186 | "Protocol Buffers Mode Commands" | ||
2118 | 187 | (cons "Protocol Buffers" (c-lang-const c-mode-menu protobuf))) | ||
2119 | 188 | |||
2120 | 189 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode)) | ||
2121 | 190 | |||
2122 | 191 | ;;;###autoload | ||
2123 | 192 | (defun protobuf-mode () | ||
2124 | 193 | "Major mode for editing Protocol Buffers description language. | ||
2125 | 194 | |||
2126 | 195 | The hook `c-mode-common-hook' is run with no argument at mode | ||
2127 | 196 | initialization, then `protobuf-mode-hook'. | ||
2128 | 197 | |||
2129 | 198 | Key bindings: | ||
2130 | 199 | \\{protobuf-mode-map}" | ||
2131 | 200 | (interactive) | ||
2132 | 201 | (kill-all-local-variables) | ||
2133 | 202 | (set-syntax-table protobuf-mode-syntax-table) | ||
2134 | 203 | (setq major-mode 'protobuf-mode | ||
2135 | 204 | mode-name "Protocol-Buffers" | ||
2136 | 205 | local-abbrev-table protobuf-mode-abbrev-table | ||
2137 | 206 | abbrev-mode t) | ||
2138 | 207 | (use-local-map protobuf-mode-map) | ||
2139 | 208 | (c-initialize-cc-mode t) | ||
2140 | 209 | (c-make-emacs-variables-local) | ||
2141 | 210 | (c-init-language-vars protobuf-mode) | ||
2142 | 211 | (c-common-init 'protobuf-mode) | ||
2143 | 212 | (easy-menu-add protobuf-menu) | ||
2144 | 213 | (c-run-mode-hooks 'c-mode-common-hook 'protobuf-mode-hook) | ||
2145 | 214 | (c-update-modeline)) | ||
2146 | 215 | |||
2147 | 216 | (provide 'protobuf-mode) | ||
2148 | 217 | |||
2149 | 218 | ;;; protobuf-mode.el ends here | ||
2150 | 0 | 219 | ||
2151 | === removed file 'editors/protobuf-mode.el' | |||
2152 | --- editors/protobuf-mode.el 2009-06-24 00:19:03 +0000 | |||
2153 | +++ editors/protobuf-mode.el 1970-01-01 00:00:00 +0000 | |||
2154 | @@ -1,217 +0,0 @@ | |||
2155 | 1 | ;;; protobuf-mode.el --- major mode for editing protocol buffers. | ||
2156 | 2 | |||
2157 | 3 | ;; Author: Alexandre Vassalotti <alexandre@peadrop.com> | ||
2158 | 4 | ;; Created: 23-Apr-2009 | ||
2159 | 5 | ;; Version: 0.3 | ||
2160 | 6 | ;; Keywords: google protobuf languages | ||
2161 | 7 | |||
2162 | 8 | ;; Redistribution and use in source and binary forms, with or without | ||
2163 | 9 | ;; modification, are permitted provided that the following conditions are | ||
2164 | 10 | ;; met: | ||
2165 | 11 | ;; | ||
2166 | 12 | ;; * Redistributions of source code must retain the above copyright | ||
2167 | 13 | ;; notice, this list of conditions and the following disclaimer. | ||
2168 | 14 | ;; * Redistributions in binary form must reproduce the above | ||
2169 | 15 | ;; copyright notice, this list of conditions and the following disclaimer | ||
2170 | 16 | ;; in the documentation and/or other materials provided with the | ||
2171 | 17 | ;; distribution. | ||
2172 | 18 | ;; * Neither the name of Google Inc. nor the names of its | ||
2173 | 19 | ;; contributors may be used to endorse or promote products derived from | ||
2174 | 20 | ;; this software without specific prior written permission. | ||
2175 | 21 | ;; | ||
2176 | 22 | ;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
2177 | 23 | ;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
2178 | 24 | ;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
2179 | 25 | ;; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
2180 | 26 | ;; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
2181 | 27 | ;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
2182 | 28 | ;; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
2183 | 29 | ;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
2184 | 30 | ;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
2185 | 31 | ;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
2186 | 32 | ;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
2187 | 33 | |||
2188 | 34 | ;;; Commentary: | ||
2189 | 35 | |||
2190 | 36 | ;; Installation: | ||
2191 | 37 | ;; - Put `protobuf-mode.el' in your Emacs load-path. | ||
2192 | 38 | ;; - Add this line to your .emacs file: | ||
2193 | 39 | ;; (require 'protobuf-mode) | ||
2194 | 40 | ;; | ||
2195 | 41 | ;; You can customize this mode just like any mode derived from CC Mode. If | ||
2196 | 42 | ;; you want to add customizations specific to protobuf-mode, you can use the | ||
2197 | 43 | ;; `protobuf-mode-hook'. For example, the following would make protocol-mode | ||
2198 | 44 | ;; use 2-space indentation: | ||
2199 | 45 | ;; | ||
2200 | 46 | ;; (defconst my-protobuf-style | ||
2201 | 47 | ;; '((c-basic-offset . 2) | ||
2202 | 48 | ;; (indent-tabs-mode . nil))) | ||
2203 | 49 | ;; | ||
2204 | 50 | ;; (add-hook 'protobuf-mode-hook | ||
2205 | 51 | ;; (lambda () (c-add-style "my-style" my-protobuf-style t))) | ||
2206 | 52 | ;; | ||
2207 | 53 | ;; Refer to the documentation of CC Mode for more information about | ||
2208 | 54 | ;; customization details and how to use this mode. | ||
2209 | 55 | ;; | ||
2210 | 56 | ;; TODO: | ||
2211 | 57 | ;; - Make highlighting for enum values work properly. | ||
2212 | 58 | ;; - Fix the parser to recognize extensions as identifiers and not | ||
2213 | 59 | ;; as casts. | ||
2214 | 60 | ;; - Improve the parsing of option assignment lists. For example: | ||
2215 | 61 | ;; optional int32 foo = 1 [(my_field_option) = 4.5]; | ||
2216 | 62 | ;; - Add support for fully-qualified identifiers (e.g., with a leading "."). | ||
2217 | 63 | |||
2218 | 64 | ;;; Code: | ||
2219 | 65 | |||
2220 | 66 | (require 'cc-mode) | ||
2221 | 67 | |||
2222 | 68 | (eval-when-compile | ||
2223 | 69 | (require 'cc-langs) | ||
2224 | 70 | (require 'cc-fonts)) | ||
2225 | 71 | |||
2226 | 72 | ;; This mode does not inherit properties from other modes. So, we do not use | ||
2227 | 73 | ;; the usual `c-add-language' function. | ||
2228 | 74 | (put 'protobuf-mode 'c-mode-prefix "protobuf-") | ||
2229 | 75 | |||
2230 | 76 | ;; The following code uses of the `c-lang-defconst' macro define syntactic | ||
2231 | 77 | ;; features of protocol buffer language. Refer to the documentation in the | ||
2232 | 78 | ;; cc-langs.el file for information about the meaning of the -kwds variables. | ||
2233 | 79 | |||
2234 | 80 | (c-lang-defconst c-primitive-type-kwds | ||
2235 | 81 | protobuf '("double" "float" "int32" "int64" "uint32" "uint64" "sint32" | ||
2236 | 82 | "sint64" "fixed32" "fixed64" "sfixed32" "sfixed64" "bool" | ||
2237 | 83 | "string" "bytes" "group")) | ||
2238 | 84 | |||
2239 | 85 | (c-lang-defconst c-modifier-kwds | ||
2240 | 86 | protobuf '("required" "optional" "repeated")) | ||
2241 | 87 | |||
2242 | 88 | (c-lang-defconst c-class-decl-kwds | ||
2243 | 89 | protobuf '("message" "enum" "service")) | ||
2244 | 90 | |||
2245 | 91 | (c-lang-defconst c-constant-kwds | ||
2246 | 92 | protobuf '("true" "false")) | ||
2247 | 93 | |||
2248 | 94 | (c-lang-defconst c-other-decl-kwds | ||
2249 | 95 | protobuf '("package" "import")) | ||
2250 | 96 | |||
2251 | 97 | (c-lang-defconst c-other-kwds | ||
2252 | 98 | protobuf '("default" "max")) | ||
2253 | 99 | |||
2254 | 100 | (c-lang-defconst c-identifier-ops | ||
2255 | 101 | ;; Handle extended identifiers like google.protobuf.MessageOptions | ||
2256 | 102 | protobuf '((left-assoc "."))) | ||
2257 | 103 | |||
2258 | 104 | ;; The following keywords do not fit well in keyword classes defined by | ||
2259 | 105 | ;; cc-mode. So, we approximate as best we can. | ||
2260 | 106 | |||
2261 | 107 | (c-lang-defconst c-type-list-kwds | ||
2262 | 108 | protobuf '("extensions" "to")) | ||
2263 | 109 | |||
2264 | 110 | (c-lang-defconst c-typeless-decl-kwds | ||
2265 | 111 | protobuf '("extend" "rpc" "option" "returns")) | ||
2266 | 112 | |||
2267 | 113 | |||
2268 | 114 | ;; Here we remove default syntax for loops, if-statements and other C | ||
2269 | 115 | ;; syntactic features that are not supported by the protocol buffer language. | ||
2270 | 116 | |||
2271 | 117 | (c-lang-defconst c-brace-list-decl-kwds | ||
2272 | 118 | ;; Remove syntax for C-style enumerations. | ||
2273 | 119 | protobuf nil) | ||
2274 | 120 | |||
2275 | 121 | (c-lang-defconst c-block-stmt-1-kwds | ||
2276 | 122 | ;; Remove syntax for "do" and "else" keywords. | ||
2277 | 123 | protobuf nil) | ||
2278 | 124 | |||
2279 | 125 | (c-lang-defconst c-block-stmt-2-kwds | ||
2280 | 126 | ;; Remove syntax for "for", "if", "switch" and "while" keywords. | ||
2281 | 127 | protobuf nil) | ||
2282 | 128 | |||
2283 | 129 | (c-lang-defconst c-simple-stmt-kwds | ||
2284 | 130 | ;; Remove syntax for "break", "continue", "goto" and "return" keywords. | ||
2285 | 131 | protobuf nil) | ||
2286 | 132 | |||
2287 | 133 | (c-lang-defconst c-paren-stmt-kwds | ||
2288 | 134 | ;; Remove special case for the "(;;)" in for-loops. | ||
2289 | 135 | protobuf nil) | ||
2290 | 136 | |||
2291 | 137 | (c-lang-defconst c-label-kwds | ||
2292 | 138 | ;; Remove case label syntax for the "case" and "default" keywords. | ||
2293 | 139 | protobuf nil) | ||
2294 | 140 | |||
2295 | 141 | (c-lang-defconst c-before-label-kwds | ||
2296 | 142 | ;; Remove special case for the label in a goto statement. | ||
2297 | 143 | protobuf nil) | ||
2298 | 144 | |||
2299 | 145 | (c-lang-defconst c-cpp-matchers | ||
2300 | 146 | ;; Disable all the C preprocessor syntax. | ||
2301 | 147 | protobuf nil) | ||
2302 | 148 | |||
2303 | 149 | (c-lang-defconst c-decl-prefix-re | ||
2304 | 150 | ;; Same as for C, except it does not match "(". This is needed for disabling | ||
2305 | 151 | ;; the syntax for casts. | ||
2306 | 152 | protobuf "\\([\{\};,]+\\)") | ||
2307 | 153 | |||
2308 | 154 | |||
2309 | 155 | ;; Add support for variable levels of syntax highlighting. | ||
2310 | 156 | |||
2311 | 157 | (defconst protobuf-font-lock-keywords-1 (c-lang-const c-matchers-1 protobuf) | ||
2312 | 158 | "Minimal highlighting for protobuf-mode.") | ||
2313 | 159 | |||
2314 | 160 | (defconst protobuf-font-lock-keywords-2 (c-lang-const c-matchers-2 protobuf) | ||
2315 | 161 | "Fast normal highlighting for protobuf-mode.") | ||
2316 | 162 | |||
2317 | 163 | (defconst protobuf-font-lock-keywords-3 (c-lang-const c-matchers-3 protobuf) | ||
2318 | 164 | "Accurate normal highlighting for protobuf-mode.") | ||
2319 | 165 | |||
2320 | 166 | (defvar protobuf-font-lock-keywords protobuf-font-lock-keywords-3 | ||
2321 | 167 | "Default expressions to highlight in protobuf-mode.") | ||
2322 | 168 | |||
2323 | 169 | ;; Our syntax table is auto-generated from the keyword classes we defined | ||
2324 | 170 | ;; previously with the `c-lang-const' macro. | ||
2325 | 171 | (defvar protobuf-mode-syntax-table nil | ||
2326 | 172 | "Syntax table used in protobuf-mode buffers.") | ||
2327 | 173 | (or protobuf-mode-syntax-table | ||
2328 | 174 | (setq protobuf-mode-syntax-table | ||
2329 | 175 | (funcall (c-lang-const c-make-mode-syntax-table protobuf)))) | ||
2330 | 176 | |||
2331 | 177 | (defvar protobuf-mode-abbrev-table nil | ||
2332 | 178 | "Abbreviation table used in protobuf-mode buffers.") | ||
2333 | 179 | |||
2334 | 180 | (defvar protobuf-mode-map nil | ||
2335 | 181 | "Keymap used in protobuf-mode buffers.") | ||
2336 | 182 | (or protobuf-mode-map | ||
2337 | 183 | (setq protobuf-mode-map (c-make-inherited-keymap))) | ||
2338 | 184 | |||
2339 | 185 | (easy-menu-define protobuf-menu protobuf-mode-map | ||
2340 | 186 | "Protocol Buffers Mode Commands" | ||
2341 | 187 | (cons "Protocol Buffers" (c-lang-const c-mode-menu protobuf))) | ||
2342 | 188 | |||
2343 | 189 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode)) | ||
2344 | 190 | |||
2345 | 191 | ;;;###autoload | ||
2346 | 192 | (defun protobuf-mode () | ||
2347 | 193 | "Major mode for editing Protocol Buffers description language. | ||
2348 | 194 | |||
2349 | 195 | The hook `c-mode-common-hook' is run with no argument at mode | ||
2350 | 196 | initialization, then `protobuf-mode-hook'. | ||
2351 | 197 | |||
2352 | 198 | Key bindings: | ||
2353 | 199 | \\{protobuf-mode-map}" | ||
2354 | 200 | (interactive) | ||
2355 | 201 | (kill-all-local-variables) | ||
2356 | 202 | (set-syntax-table protobuf-mode-syntax-table) | ||
2357 | 203 | (setq major-mode 'protobuf-mode | ||
2358 | 204 | mode-name "Protocol-Buffers" | ||
2359 | 205 | local-abbrev-table protobuf-mode-abbrev-table | ||
2360 | 206 | abbrev-mode t) | ||
2361 | 207 | (use-local-map protobuf-mode-map) | ||
2362 | 208 | (c-initialize-cc-mode t) | ||
2363 | 209 | (c-init-language-vars protobuf-mode) | ||
2364 | 210 | (c-common-init 'protobuf-mode) | ||
2365 | 211 | (easy-menu-add protobuf-menu) | ||
2366 | 212 | (c-run-mode-hooks 'c-mode-common-hook 'protobuf-mode-hook) | ||
2367 | 213 | (c-update-modeline)) | ||
2368 | 214 | |||
2369 | 215 | (provide 'protobuf-mode) | ||
2370 | 216 | |||
2371 | 217 | ;;; protobuf-mode.el ends here | ||
2372 | 218 | 0 | ||
2373 | === modified file 'examples/Makefile' | |||
2374 | --- examples/Makefile 2009-06-24 00:19:03 +0000 | |||
2375 | +++ examples/Makefile 2010-01-18 04:34:16 +0000 | |||
2376 | @@ -22,10 +22,12 @@ | |||
2377 | 22 | @touch protoc_middleman | 22 | @touch protoc_middleman |
2378 | 23 | 23 | ||
2379 | 24 | add_person_cpp: add_person.cc protoc_middleman | 24 | add_person_cpp: add_person.cc protoc_middleman |
2381 | 25 | c++ add_person.cc addressbook.pb.cc -lprotobuf -lpthread -o add_person_cpp | 25 | pkg-config --cflags protobuf # fails if protobuf is not installed |
2382 | 26 | c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` | ||
2383 | 26 | 27 | ||
2384 | 27 | list_people_cpp: list_people.cc protoc_middleman | 28 | list_people_cpp: list_people.cc protoc_middleman |
2386 | 28 | c++ list_people.cc addressbook.pb.cc -lprotobuf -lpthread -o list_people_cpp | 29 | pkg-config --cflags protobuf # fails if protobuf is not installed |
2387 | 30 | c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` | ||
2388 | 29 | 31 | ||
2389 | 30 | javac_middleman: AddPerson.java ListPeople.java protoc_middleman | 32 | javac_middleman: AddPerson.java ListPeople.java protoc_middleman |
2390 | 31 | javac AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java | 33 | javac AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java |
2391 | 32 | 34 | ||
2392 | === modified file 'examples/add_person.cc' | |||
2393 | --- examples/add_person.cc 2008-08-03 11:01:44 +0000 | |||
2394 | +++ examples/add_person.cc 2010-01-18 04:34:16 +0000 | |||
2395 | @@ -88,5 +88,8 @@ | |||
2396 | 88 | } | 88 | } |
2397 | 89 | } | 89 | } |
2398 | 90 | 90 | ||
2399 | 91 | // Optional: Delete all global objects allocated by libprotobuf. | ||
2400 | 92 | google::protobuf::ShutdownProtobufLibrary(); | ||
2401 | 93 | |||
2402 | 91 | return 0; | 94 | return 0; |
2403 | 92 | } | 95 | } |
2404 | 93 | 96 | ||
2405 | === modified file 'examples/list_people.cc' | |||
2406 | --- examples/list_people.cc 2008-08-03 11:01:44 +0000 | |||
2407 | +++ examples/list_people.cc 2010-01-18 04:34:16 +0000 | |||
2408 | @@ -61,5 +61,8 @@ | |||
2409 | 61 | 61 | ||
2410 | 62 | ListPeople(address_book); | 62 | ListPeople(address_book); |
2411 | 63 | 63 | ||
2412 | 64 | // Optional: Delete all global objects allocated by libprotobuf. | ||
2413 | 65 | google::protobuf::ShutdownProtobufLibrary(); | ||
2414 | 66 | |||
2415 | 64 | return 0; | 67 | return 0; |
2416 | 65 | } | 68 | } |
2417 | 66 | 69 | ||
2418 | === modified file 'generate_descriptor_proto.sh' | |||
2419 | --- generate_descriptor_proto.sh 2008-12-18 01:26:29 +0000 | |||
2420 | +++ generate_descriptor_proto.sh 2010-01-18 04:34:16 +0000 | |||
2421 | @@ -5,6 +5,10 @@ | |||
2422 | 5 | # itself, they cannot be generated automatically by a make rule. "make check" | 5 | # itself, they cannot be generated automatically by a make rule. "make check" |
2423 | 6 | # will fail if these files do not match what the protocol compiler would | 6 | # will fail if these files do not match what the protocol compiler would |
2424 | 7 | # generate. | 7 | # generate. |
2425 | 8 | # | ||
2426 | 9 | # HINT: Flags passed to generate_descriptor_proto.sh will be passed directly | ||
2427 | 10 | # to make when building protoc. This is particularly useful for passing | ||
2428 | 11 | # -j4 to run 4 jobs simultaneously. | ||
2429 | 8 | 12 | ||
2430 | 9 | if test ! -e src/google/protobuf/stubs/common.h; then | 13 | if test ! -e src/google/protobuf/stubs/common.h; then |
2431 | 10 | cat >&2 << __EOF__ | 14 | cat >&2 << __EOF__ |
2432 | @@ -23,5 +27,5 @@ | |||
2433 | 23 | fi | 27 | fi |
2434 | 24 | 28 | ||
2435 | 25 | cd src | 29 | cd src |
2437 | 26 | make protoc && ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:. google/protobuf/descriptor.proto | 30 | make $@ protoc && ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:. google/protobuf/descriptor.proto |
2438 | 27 | cd .. | 31 | cd .. |
2439 | 28 | 32 | ||
2440 | === added directory 'gtest' | |||
2441 | === removed directory 'gtest' | |||
2442 | === added file 'gtest/CHANGES' | |||
2443 | --- gtest/CHANGES 1970-01-01 00:00:00 +0000 | |||
2444 | +++ gtest/CHANGES 2010-01-18 04:34:16 +0000 | |||
2445 | @@ -0,0 +1,57 @@ | |||
2446 | 1 | Changes for 1.3.0: | ||
2447 | 2 | |||
2448 | 3 | * New feature: death tests on Windows, Cygwin, and Mac. | ||
2449 | 4 | * New feature: ability to use Google Test assertions in other testing | ||
2450 | 5 | frameworks. | ||
2451 | 6 | * New feature: ability to run disabled test via | ||
2452 | 7 | --gtest_also_run_disabled_tests. | ||
2453 | 8 | * New feature: the --help flag for printing the usage. | ||
2454 | 9 | * New feature: access to Google Test flag values in user code. | ||
2455 | 10 | * New feature: a script that packs Google Test into one .h and one | ||
2456 | 11 | .cc file for easy deployment. | ||
2457 | 12 | * New feature: support for distributing test functions to multiple | ||
2458 | 13 | machines (requires support from the test runner). | ||
2459 | 14 | * Bug fixes and implementation clean-up. | ||
2460 | 15 | |||
2461 | 16 | Changes for 1.2.1: | ||
2462 | 17 | |||
2463 | 18 | * Compatibility fixes for Linux IA-64 and IBM z/OS. | ||
2464 | 19 | * Added support for using Boost and other TR1 implementations. | ||
2465 | 20 | * Changes to the build scripts to support upcoming release of Google C++ | ||
2466 | 21 | Mocking Framework. | ||
2467 | 22 | * Added Makefile to the distribution package. | ||
2468 | 23 | * Improved build instructions in README. | ||
2469 | 24 | |||
2470 | 25 | Changes for 1.2.0: | ||
2471 | 26 | |||
2472 | 27 | * New feature: value-parameterized tests. | ||
2473 | 28 | * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS) | ||
2474 | 29 | macros. | ||
2475 | 30 | * Changed the XML report format to match JUnit/Ant's. | ||
2476 | 31 | * Added tests to the Xcode project. | ||
2477 | 32 | * Added scons/SConscript for building with SCons. | ||
2478 | 33 | * Added src/gtest-all.cc for building Google Test from a single file. | ||
2479 | 34 | * Fixed compatibility with Solaris and z/OS. | ||
2480 | 35 | * Enabled running Python tests on systems with python 2.3 installed, | ||
2481 | 36 | e.g. Mac OS X 10.4. | ||
2482 | 37 | * Bug fixes. | ||
2483 | 38 | |||
2484 | 39 | Changes for 1.1.0: | ||
2485 | 40 | |||
2486 | 41 | * New feature: type-parameterized tests. | ||
2487 | 42 | * New feature: exception assertions. | ||
2488 | 43 | * New feature: printing elapsed time of tests. | ||
2489 | 44 | * Improved the robustness of death tests. | ||
2490 | 45 | * Added an Xcode project and samples. | ||
2491 | 46 | * Adjusted the output format on Windows to be understandable by Visual Studio. | ||
2492 | 47 | * Minor bug fixes. | ||
2493 | 48 | |||
2494 | 49 | Changes for 1.0.1: | ||
2495 | 50 | |||
2496 | 51 | * Added project files for Visual Studio 7.1. | ||
2497 | 52 | * Fixed issues with compiling on Mac OS X. | ||
2498 | 53 | * Fixed issues with compiling on Cygwin. | ||
2499 | 54 | |||
2500 | 55 | Changes for 1.0.0: | ||
2501 | 56 | |||
2502 | 57 | * Initial Open Source release of Google Test | ||
2503 | 0 | 58 | ||
2504 | === removed file 'gtest/CHANGES' | |||
2505 | --- gtest/CHANGES 2009-06-24 00:19:03 +0000 | |||
2506 | +++ gtest/CHANGES 1970-01-01 00:00:00 +0000 | |||
2507 | @@ -1,57 +0,0 @@ | |||
2508 | 1 | Changes for 1.3.0: | ||
2509 | 2 | |||
2510 | 3 | * New feature: death tests on Windows, Cygwin, and Mac. | ||
2511 | 4 | * New feature: ability to use Google Test assertions in other testing | ||
2512 | 5 | frameworks. | ||
2513 | 6 | * New feature: ability to run disabled test via | ||
2514 | 7 | --gtest_also_run_disabled_tests. | ||
2515 | 8 | * New feature: the --help flag for printing the usage. | ||
2516 | 9 | * New feature: access to Google Test flag values in user code. | ||
2517 | 10 | * New feature: a script that packs Google Test into one .h and one | ||
2518 | 11 | .cc file for easy deployment. | ||
2519 | 12 | * New feature: support for distributing test functions to multiple | ||
2520 | 13 | machines (requires support from the test runner). | ||
2521 | 14 | * Bug fixes and implementation clean-up. | ||
2522 | 15 | |||
2523 | 16 | Changes for 1.2.1: | ||
2524 | 17 | |||
2525 | 18 | * Compatibility fixes for Linux IA-64 and IBM z/OS. | ||
2526 | 19 | * Added support for using Boost and other TR1 implementations. | ||
2527 | 20 | * Changes to the build scripts to support upcoming release of Google C++ | ||
2528 | 21 | Mocking Framework. | ||
2529 | 22 | * Added Makefile to the distribution package. | ||
2530 | 23 | * Improved build instructions in README. | ||
2531 | 24 | |||
2532 | 25 | Changes for 1.2.0: | ||
2533 | 26 | |||
2534 | 27 | * New feature: value-parameterized tests. | ||
2535 | 28 | * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS) | ||
2536 | 29 | macros. | ||
2537 | 30 | * Changed the XML report format to match JUnit/Ant's. | ||
2538 | 31 | * Added tests to the Xcode project. | ||
2539 | 32 | * Added scons/SConscript for building with SCons. | ||
2540 | 33 | * Added src/gtest-all.cc for building Google Test from a single file. | ||
2541 | 34 | * Fixed compatibility with Solaris and z/OS. | ||
2542 | 35 | * Enabled running Python tests on systems with python 2.3 installed, | ||
2543 | 36 | e.g. Mac OS X 10.4. | ||
2544 | 37 | * Bug fixes. | ||
2545 | 38 | |||
2546 | 39 | Changes for 1.1.0: | ||
2547 | 40 | |||
2548 | 41 | * New feature: type-parameterized tests. | ||
2549 | 42 | * New feature: exception assertions. | ||
2550 | 43 | * New feature: printing elapsed time of tests. | ||
2551 | 44 | * Improved the robustness of death tests. | ||
2552 | 45 | * Added an Xcode project and samples. | ||
2553 | 46 | * Adjusted the output format on Windows to be understandable by Visual Studio. | ||
2554 | 47 | * Minor bug fixes. | ||
2555 | 48 | |||
2556 | 49 | Changes for 1.0.1: | ||
2557 | 50 | |||
2558 | 51 | * Added project files for Visual Studio 7.1. | ||
2559 | 52 | * Fixed issues with compiling on Mac OS X. | ||
2560 | 53 | * Fixed issues with compiling on Cygwin. | ||
2561 | 54 | |||
2562 | 55 | Changes for 1.0.0: | ||
2563 | 56 | |||
2564 | 57 | * Initial Open Source release of Google Test | ||
2565 | 58 | 0 | ||
2566 | === added file 'gtest/CONTRIBUTORS' | |||
2567 | --- gtest/CONTRIBUTORS 1970-01-01 00:00:00 +0000 | |||
2568 | +++ gtest/CONTRIBUTORS 2010-01-18 04:34:16 +0000 | |||
2569 | @@ -0,0 +1,33 @@ | |||
2570 | 1 | # This file contains a list of people who've made non-trivial | ||
2571 | 2 | # contribution to the Google C++ Testing Framework project. People | ||
2572 | 3 | # who commit code to the project are encouraged to add their names | ||
2573 | 4 | # here. Please keep the list sorted by first names. | ||
2574 | 5 | |||
2575 | 6 | Ajay Joshi <jaj@google.com> | ||
2576 | 7 | Balázs Dán <balazs.dan@gmail.com> | ||
2577 | 8 | Bharat Mediratta <bharat@menalto.com> | ||
2578 | 9 | Chandler Carruth <chandlerc@google.com> | ||
2579 | 10 | Chris Prince <cprince@google.com> | ||
2580 | 11 | Chris Taylor <taylorc@google.com> | ||
2581 | 12 | Dan Egnor <egnor@google.com> | ||
2582 | 13 | Eric Roman <eroman@chromium.org> | ||
2583 | 14 | Jeffrey Yasskin <jyasskin@google.com> | ||
2584 | 15 | Jói Sigurðsson <joi@google.com> | ||
2585 | 16 | Keir Mierle <mierle@gmail.com> | ||
2586 | 17 | Keith Ray <keith.ray@gmail.com> | ||
2587 | 18 | Kenton Varda <kenton@google.com> | ||
2588 | 19 | Markus Heule <markus.heule@gmail.com> | ||
2589 | 20 | Mika Raento <mikie@iki.fi> | ||
2590 | 21 | Patrick Hanna <phanna@google.com> | ||
2591 | 22 | Patrick Riley <pfr@google.com> | ||
2592 | 23 | Peter Kaminski <piotrk@google.com> | ||
2593 | 24 | Preston Jackson <preston.jackson@gmail.com> | ||
2594 | 25 | Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com> | ||
2595 | 26 | Russ Cox <rsc@google.com> | ||
2596 | 27 | Russ Rufer <russ@pentad.com> | ||
2597 | 28 | Sean Mcafee <eefacm@gmail.com> | ||
2598 | 29 | Sigurður Ásgeirsson <siggi@google.com> | ||
2599 | 30 | Tracy Bialik <tracy@pentad.com> | ||
2600 | 31 | Vadim Berman <vadimb@google.com> | ||
2601 | 32 | Vlad Losev <vladl@google.com> | ||
2602 | 33 | Zhanyong Wan <wan@google.com> | ||
2603 | 0 | 34 | ||
2604 | === removed file 'gtest/CONTRIBUTORS' | |||
2605 | --- gtest/CONTRIBUTORS 2009-06-24 00:19:03 +0000 | |||
2606 | +++ gtest/CONTRIBUTORS 1970-01-01 00:00:00 +0000 | |||
2607 | @@ -1,33 +0,0 @@ | |||
2608 | 1 | # This file contains a list of people who've made non-trivial | ||
2609 | 2 | # contribution to the Google C++ Testing Framework project. People | ||
2610 | 3 | # who commit code to the project are encouraged to add their names | ||
2611 | 4 | # here. Please keep the list sorted by first names. | ||
2612 | 5 | |||
2613 | 6 | Ajay Joshi <jaj@google.com> | ||
2614 | 7 | Balázs Dán <balazs.dan@gmail.com> | ||
2615 | 8 | Bharat Mediratta <bharat@menalto.com> | ||
2616 | 9 | Chandler Carruth <chandlerc@google.com> | ||
2617 | 10 | Chris Prince <cprince@google.com> | ||
2618 | 11 | Chris Taylor <taylorc@google.com> | ||
2619 | 12 | Dan Egnor <egnor@google.com> | ||
2620 | 13 | Eric Roman <eroman@chromium.org> | ||
2621 | 14 | Jeffrey Yasskin <jyasskin@google.com> | ||
2622 | 15 | Jói Sigurðsson <joi@google.com> | ||
2623 | 16 | Keir Mierle <mierle@gmail.com> | ||
2624 | 17 | Keith Ray <keith.ray@gmail.com> | ||
2625 | 18 | Kenton Varda <kenton@google.com> | ||
2626 | 19 | Markus Heule <markus.heule@gmail.com> | ||
2627 | 20 | Mika Raento <mikie@iki.fi> | ||
2628 | 21 | Patrick Hanna <phanna@google.com> | ||
2629 | 22 | Patrick Riley <pfr@google.com> | ||
2630 | 23 | Peter Kaminski <piotrk@google.com> | ||
2631 | 24 | Preston Jackson <preston.jackson@gmail.com> | ||
2632 | 25 | Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com> | ||
2633 | 26 | Russ Cox <rsc@google.com> | ||
2634 | 27 | Russ Rufer <russ@pentad.com> | ||
2635 | 28 | Sean Mcafee <eefacm@gmail.com> | ||
2636 | 29 | Sigurður Ásgeirsson <siggi@google.com> | ||
2637 | 30 | Tracy Bialik <tracy@pentad.com> | ||
2638 | 31 | Vadim Berman <vadimb@google.com> | ||
2639 | 32 | Vlad Losev <vladl@google.com> | ||
2640 | 33 | Zhanyong Wan <wan@google.com> | ||
2641 | 34 | 0 | ||
2642 | === added file 'gtest/COPYING' | |||
2643 | --- gtest/COPYING 1970-01-01 00:00:00 +0000 | |||
2644 | +++ gtest/COPYING 2010-01-18 04:34:16 +0000 | |||
2645 | @@ -0,0 +1,28 @@ | |||
2646 | 1 | Copyright 2008, Google Inc. | ||
2647 | 2 | All rights reserved. | ||
2648 | 3 | |||
2649 | 4 | Redistribution and use in source and binary forms, with or without | ||
2650 | 5 | modification, are permitted provided that the following conditions are | ||
2651 | 6 | met: | ||
2652 | 7 | |||
2653 | 8 | * Redistributions of source code must retain the above copyright | ||
2654 | 9 | notice, this list of conditions and the following disclaimer. | ||
2655 | 10 | * Redistributions in binary form must reproduce the above | ||
2656 | 11 | copyright notice, this list of conditions and the following disclaimer | ||
2657 | 12 | in the documentation and/or other materials provided with the | ||
2658 | 13 | distribution. | ||
2659 | 14 | * Neither the name of Google Inc. nor the names of its | ||
2660 | 15 | contributors may be used to endorse or promote products derived from | ||
2661 | 16 | this software without specific prior written permission. | ||
2662 | 17 | |||
2663 | 18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
2664 | 19 | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
2665 | 20 | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
2666 | 21 | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
2667 | 22 | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
2668 | 23 | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
2669 | 24 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
2670 | 25 | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
2671 | 26 | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
2672 | 27 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
2673 | 28 | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
2674 | 0 | 29 | ||
2675 | === removed file 'gtest/COPYING' | |||
2676 | --- gtest/COPYING 2009-06-24 00:19:03 +0000 | |||
2677 | +++ gtest/COPYING 1970-01-01 00:00:00 +0000 | |||
2678 | @@ -1,28 +0,0 @@ | |||
2679 | 1 | Copyright 2008, Google Inc. | ||
2680 | 2 | All rights reserved. | ||
2681 | 3 | |||
2682 | 4 | Redistribution and use in source and binary forms, with or without | ||
2683 | 5 | modification, are permitted provided that the following conditions are | ||
2684 | 6 | met: | ||
2685 | 7 | |||
2686 | 8 | * Redistributions of source code must retain the above copyright | ||
2687 | 9 | notice, this list of conditions and the following disclaimer. | ||
2688 | 10 | * Redistributions in binary form must reproduce the above | ||
2689 | 11 | copyright notice, this list of conditions and the following disclaimer | ||
2690 | 12 | in the documentation and/or other materials provided with the | ||
2691 | 13 | distribution. | ||
2692 | 14 | * Neither the name of Google Inc. nor the names of its | ||
2693 | 15 | contributors may be used to endorse or promote products derived from | ||
2694 | 16 | this software without specific prior written permission. | ||
2695 | 17 | |||
2696 | 18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
2697 | 19 | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
2698 | 20 | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
2699 | 21 | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
2700 | 22 | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
2701 | 23 | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
2702 | 24 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
2703 | 25 | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
2704 | 26 | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
2705 | 27 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
2706 | 28 | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
2707 | 29 | 0 | ||
2708 | === added file 'gtest/Makefile.am' | |||
2709 | --- gtest/Makefile.am 1970-01-01 00:00:00 +0000 | |||
2710 | +++ gtest/Makefile.am 2010-01-18 04:34:16 +0000 | |||
2711 | @@ -0,0 +1,422 @@ | |||
2712 | 1 | # Automake file | ||
2713 | 2 | |||
2714 | 3 | # TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump. | ||
2715 | 4 | |||
2716 | 5 | # Nonstandard package files for distribution | ||
2717 | 6 | EXTRA_DIST = \ | ||
2718 | 7 | CHANGES \ | ||
2719 | 8 | CONTRIBUTORS \ | ||
2720 | 9 | include/gtest/gtest-param-test.h.pump \ | ||
2721 | 10 | include/gtest/internal/gtest-tuple.h.pump \ | ||
2722 | 11 | include/gtest/internal/gtest-type-util.h.pump \ | ||
2723 | 12 | include/gtest/internal/gtest-param-util-generated.h.pump \ | ||
2724 | 13 | make/Makefile \ | ||
2725 | 14 | scons/SConscript \ | ||
2726 | 15 | scripts/fuse_gtest_files.py \ | ||
2727 | 16 | scripts/gen_gtest_pred_impl.py \ | ||
2728 | 17 | scripts/test/Makefile \ | ||
2729 | 18 | test/gtest_all_test.cc | ||
2730 | 19 | |||
2731 | 20 | # MSVC project files | ||
2732 | 21 | EXTRA_DIST += \ | ||
2733 | 22 | msvc/gtest.sln \ | ||
2734 | 23 | msvc/gtest.vcproj \ | ||
2735 | 24 | msvc/gtest_color_test_.vcproj \ | ||
2736 | 25 | msvc/gtest_env_var_test_.vcproj \ | ||
2737 | 26 | msvc/gtest_environment_test.vcproj \ | ||
2738 | 27 | msvc/gtest_main.vcproj \ | ||
2739 | 28 | msvc/gtest_output_test_.vcproj \ | ||
2740 | 29 | msvc/gtest_prod_test.vcproj \ | ||
2741 | 30 | msvc/gtest_uninitialized_test_.vcproj \ | ||
2742 | 31 | msvc/gtest_unittest.vcproj | ||
2743 | 32 | |||
2744 | 33 | # xcode project files | ||
2745 | 34 | EXTRA_DIST += \ | ||
2746 | 35 | xcode/Config/DebugProject.xcconfig \ | ||
2747 | 36 | xcode/Config/FrameworkTarget.xcconfig \ | ||
2748 | 37 | xcode/Config/General.xcconfig \ | ||
2749 | 38 | xcode/Config/ReleaseProject.xcconfig \ | ||
2750 | 39 | xcode/Config/TestTarget.xcconfig \ | ||
2751 | 40 | xcode/Config/InternalTestTarget.xcconfig \ | ||
2752 | 41 | xcode/Config/InternalPythonTestTarget.xcconfig \ | ||
2753 | 42 | xcode/Resources/Info.plist \ | ||
2754 | 43 | xcode/Scripts/versiongenerate.py \ | ||
2755 | 44 | xcode/Scripts/runtests.sh \ | ||
2756 | 45 | xcode/gtest.xcodeproj/project.pbxproj | ||
2757 | 46 | |||
2758 | 47 | # xcode sample files | ||
2759 | 48 | EXTRA_DIST += \ | ||
2760 | 49 | xcode/Samples/FrameworkSample/Info.plist \ | ||
2761 | 50 | xcode/Samples/FrameworkSample/widget_test.cc \ | ||
2762 | 51 | xcode/Samples/FrameworkSample/widget.cc \ | ||
2763 | 52 | xcode/Samples/FrameworkSample/widget.h \ | ||
2764 | 53 | xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj | ||
2765 | 54 | |||
2766 | 55 | # C++Builder project files | ||
2767 | 56 | EXTRA_DIST += \ | ||
2768 | 57 | codegear/gtest_all.cc \ | ||
2769 | 58 | codegear/gtest_link.cc \ | ||
2770 | 59 | codegear/gtest.cbproj \ | ||
2771 | 60 | codegear/gtest_main.cbproj \ | ||
2772 | 61 | codegear/gtest_unittest.cbproj \ | ||
2773 | 62 | codegear/gtest.groupproj | ||
2774 | 63 | |||
2775 | 64 | # TODO(wan@google.com): integrate scripts/gen_gtest_pred_impl.py into | ||
2776 | 65 | # the build system such that a user can specify the maximum predicate | ||
2777 | 66 | # arity here and have the script automatically generate the | ||
2778 | 67 | # corresponding .h and .cc files. | ||
2779 | 68 | |||
2780 | 69 | # Scripts and utilities | ||
2781 | 70 | bin_SCRIPTS = scripts/gtest-config | ||
2782 | 71 | CLEANFILES = $(bin_SCRIPTS) | ||
2783 | 72 | |||
2784 | 73 | # Distribute and install M4 macro | ||
2785 | 74 | m4datadir = $(datadir)/aclocal | ||
2786 | 75 | m4data_DATA = m4/gtest.m4 | ||
2787 | 76 | EXTRA_DIST += $(m4data_DATA) | ||
2788 | 77 | |||
2789 | 78 | # We define the global AM_CPPFLAGS as everything we compile includes from these | ||
2790 | 79 | # directories. | ||
2791 | 80 | AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include | ||
2792 | 81 | |||
2793 | 82 | # Build rules for libraries. | ||
2794 | 83 | lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la | ||
2795 | 84 | |||
2796 | 85 | lib_libgtest_la_SOURCES = src/gtest.cc \ | ||
2797 | 86 | src/gtest-death-test.cc \ | ||
2798 | 87 | src/gtest-filepath.cc \ | ||
2799 | 88 | src/gtest-internal-inl.h \ | ||
2800 | 89 | src/gtest-port.cc \ | ||
2801 | 90 | src/gtest-test-part.cc \ | ||
2802 | 91 | src/gtest-typed-test.cc | ||
2803 | 92 | |||
2804 | 93 | pkginclude_HEADERS = include/gtest/gtest.h \ | ||
2805 | 94 | include/gtest/gtest-death-test.h \ | ||
2806 | 95 | include/gtest/gtest-message.h \ | ||
2807 | 96 | include/gtest/gtest-param-test.h \ | ||
2808 | 97 | include/gtest/gtest_pred_impl.h \ | ||
2809 | 98 | include/gtest/gtest_prod.h \ | ||
2810 | 99 | include/gtest/gtest-spi.h \ | ||
2811 | 100 | include/gtest/gtest-test-part.h \ | ||
2812 | 101 | include/gtest/gtest-typed-test.h | ||
2813 | 102 | |||
2814 | 103 | pkginclude_internaldir = $(pkgincludedir)/internal | ||
2815 | 104 | pkginclude_internal_HEADERS = \ | ||
2816 | 105 | include/gtest/internal/gtest-death-test-internal.h \ | ||
2817 | 106 | include/gtest/internal/gtest-filepath.h \ | ||
2818 | 107 | include/gtest/internal/gtest-internal.h \ | ||
2819 | 108 | include/gtest/internal/gtest-linked_ptr.h \ | ||
2820 | 109 | include/gtest/internal/gtest-param-util-generated.h \ | ||
2821 | 110 | include/gtest/internal/gtest-param-util.h \ | ||
2822 | 111 | include/gtest/internal/gtest-port.h \ | ||
2823 | 112 | include/gtest/internal/gtest-string.h \ | ||
2824 | 113 | include/gtest/internal/gtest-tuple.h \ | ||
2825 | 114 | include/gtest/internal/gtest-type-util.h | ||
2826 | 115 | |||
2827 | 116 | lib_libgtest_main_la_SOURCES = src/gtest_main.cc | ||
2828 | 117 | lib_libgtest_main_la_LIBADD = lib/libgtest.la | ||
2829 | 118 | |||
2830 | 119 | # Bulid rules for samples and tests. Automake's naming for some of | ||
2831 | 120 | # these variables isn't terribly obvious, so this is a brief | ||
2832 | 121 | # reference: | ||
2833 | 122 | # | ||
2834 | 123 | # TESTS -- Programs run automatically by "make check" | ||
2835 | 124 | # check_PROGRAMS -- Programs built by "make check" but not necessarily run | ||
2836 | 125 | |||
2837 | 126 | noinst_LTLIBRARIES = samples/libsamples.la | ||
2838 | 127 | |||
2839 | 128 | samples_libsamples_la_SOURCES = samples/sample1.cc \ | ||
2840 | 129 | samples/sample1.h \ | ||
2841 | 130 | samples/sample2.cc \ | ||
2842 | 131 | samples/sample2.h \ | ||
2843 | 132 | samples/sample3-inl.h \ | ||
2844 | 133 | samples/sample4.cc \ | ||
2845 | 134 | samples/sample4.h | ||
2846 | 135 | |||
2847 | 136 | TESTS= | ||
2848 | 137 | TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \ | ||
2849 | 138 | GTEST_BUILD_DIR="$(top_builddir)/test" | ||
2850 | 139 | check_PROGRAMS= | ||
2851 | 140 | |||
2852 | 141 | TESTS += samples/sample1_unittest | ||
2853 | 142 | check_PROGRAMS += samples/sample1_unittest | ||
2854 | 143 | samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc | ||
2855 | 144 | samples_sample1_unittest_LDADD = lib/libgtest_main.la \ | ||
2856 | 145 | samples/libsamples.la | ||
2857 | 146 | |||
2858 | 147 | TESTS += samples/sample2_unittest | ||
2859 | 148 | check_PROGRAMS += samples/sample2_unittest | ||
2860 | 149 | samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc | ||
2861 | 150 | samples_sample2_unittest_LDADD = lib/libgtest_main.la \ | ||
2862 | 151 | samples/libsamples.la | ||
2863 | 152 | |||
2864 | 153 | TESTS += samples/sample3_unittest | ||
2865 | 154 | check_PROGRAMS += samples/sample3_unittest | ||
2866 | 155 | samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc | ||
2867 | 156 | samples_sample3_unittest_LDADD = lib/libgtest_main.la \ | ||
2868 | 157 | samples/libsamples.la | ||
2869 | 158 | |||
2870 | 159 | TESTS += samples/sample4_unittest | ||
2871 | 160 | check_PROGRAMS += samples/sample4_unittest | ||
2872 | 161 | samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc | ||
2873 | 162 | samples_sample4_unittest_LDADD = lib/libgtest_main.la \ | ||
2874 | 163 | samples/libsamples.la | ||
2875 | 164 | |||
2876 | 165 | TESTS += samples/sample5_unittest | ||
2877 | 166 | check_PROGRAMS += samples/sample5_unittest | ||
2878 | 167 | samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc | ||
2879 | 168 | samples_sample5_unittest_LDADD = lib/libgtest_main.la \ | ||
2880 | 169 | samples/libsamples.la | ||
2881 | 170 | |||
2882 | 171 | TESTS += samples/sample6_unittest | ||
2883 | 172 | check_PROGRAMS += samples/sample6_unittest | ||
2884 | 173 | samples_sample6_unittest_SOURCES = samples/prime_tables.h \ | ||
2885 | 174 | samples/sample6_unittest.cc | ||
2886 | 175 | samples_sample6_unittest_LDADD = lib/libgtest_main.la \ | ||
2887 | 176 | samples/libsamples.la | ||
2888 | 177 | |||
2889 | 178 | TESTS += samples/sample7_unittest | ||
2890 | 179 | check_PROGRAMS += samples/sample7_unittest | ||
2891 | 180 | samples_sample7_unittest_SOURCES = samples/prime_tables.h \ | ||
2892 | 181 | samples/sample7_unittest.cc | ||
2893 | 182 | samples_sample7_unittest_LDADD = lib/libgtest_main.la \ | ||
2894 | 183 | samples/libsamples.la | ||
2895 | 184 | |||
2896 | 185 | TESTS += samples/sample8_unittest | ||
2897 | 186 | check_PROGRAMS += samples/sample8_unittest | ||
2898 | 187 | samples_sample8_unittest_SOURCES = samples/prime_tables.h \ | ||
2899 | 188 | samples/sample8_unittest.cc | ||
2900 | 189 | samples_sample8_unittest_LDADD = lib/libgtest_main.la \ | ||
2901 | 190 | samples/libsamples.la | ||
2902 | 191 | |||
2903 | 192 | TESTS += test/gtest-death-test_test | ||
2904 | 193 | check_PROGRAMS += test/gtest-death-test_test | ||
2905 | 194 | test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc | ||
2906 | 195 | test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS) | ||
2907 | 196 | test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \ | ||
2908 | 197 | lib/libgtest_main.la | ||
2909 | 198 | |||
2910 | 199 | TESTS += test/gtest_environment_test | ||
2911 | 200 | check_PROGRAMS += test/gtest_environment_test | ||
2912 | 201 | test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc | ||
2913 | 202 | test_gtest_environment_test_LDADD = lib/libgtest.la | ||
2914 | 203 | |||
2915 | 204 | TESTS += test/gtest-filepath_test | ||
2916 | 205 | check_PROGRAMS += test/gtest-filepath_test | ||
2917 | 206 | test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc | ||
2918 | 207 | test_gtest_filepath_test_LDADD = lib/libgtest_main.la | ||
2919 | 208 | |||
2920 | 209 | TESTS += test/gtest-linked_ptr_test | ||
2921 | 210 | check_PROGRAMS += test/gtest-linked_ptr_test | ||
2922 | 211 | test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc | ||
2923 | 212 | test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la | ||
2924 | 213 | |||
2925 | 214 | TESTS += test/gtest_main_unittest | ||
2926 | 215 | check_PROGRAMS += test/gtest_main_unittest | ||
2927 | 216 | test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc | ||
2928 | 217 | test_gtest_main_unittest_LDADD = lib/libgtest_main.la | ||
2929 | 218 | |||
2930 | 219 | TESTS += test/gtest-message_test | ||
2931 | 220 | check_PROGRAMS += test/gtest-message_test | ||
2932 | 221 | test_gtest_message_test_SOURCES = test/gtest-message_test.cc | ||
2933 | 222 | test_gtest_message_test_LDADD = lib/libgtest_main.la | ||
2934 | 223 | |||
2935 | 224 | TESTS += test/gtest_no_test_unittest | ||
2936 | 225 | check_PROGRAMS += test/gtest_no_test_unittest | ||
2937 | 226 | test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc | ||
2938 | 227 | test_gtest_no_test_unittest_LDADD = lib/libgtest.la | ||
2939 | 228 | |||
2940 | 229 | TESTS += test/gtest-options_test | ||
2941 | 230 | check_PROGRAMS += test/gtest-options_test | ||
2942 | 231 | test_gtest_options_test_SOURCES = test/gtest-options_test.cc | ||
2943 | 232 | test_gtest_options_test_LDADD = lib/libgtest_main.la | ||
2944 | 233 | |||
2945 | 234 | TESTS += test/gtest-param-test_test | ||
2946 | 235 | check_PROGRAMS += test/gtest-param-test_test | ||
2947 | 236 | test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \ | ||
2948 | 237 | test/gtest-param-test2_test.cc \ | ||
2949 | 238 | test/gtest-param-test_test.h | ||
2950 | 239 | test_gtest_param_test_test_LDADD = lib/libgtest.la | ||
2951 | 240 | |||
2952 | 241 | TESTS += test/gtest-port_test | ||
2953 | 242 | check_PROGRAMS += test/gtest-port_test | ||
2954 | 243 | test_gtest_port_test_SOURCES = test/gtest-port_test.cc | ||
2955 | 244 | test_gtest_port_test_LDADD = lib/libgtest_main.la | ||
2956 | 245 | |||
2957 | 246 | TESTS += test/gtest_pred_impl_unittest | ||
2958 | 247 | check_PROGRAMS += test/gtest_pred_impl_unittest | ||
2959 | 248 | test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc | ||
2960 | 249 | test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la | ||
2961 | 250 | |||
2962 | 251 | TESTS += test/gtest_prod_test | ||
2963 | 252 | check_PROGRAMS += test/gtest_prod_test | ||
2964 | 253 | test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \ | ||
2965 | 254 | test/production.cc \ | ||
2966 | 255 | test/production.h | ||
2967 | 256 | test_gtest_prod_test_LDADD = lib/libgtest_main.la | ||
2968 | 257 | |||
2969 | 258 | TESTS += test/gtest_repeat_test | ||
2970 | 259 | check_PROGRAMS += test/gtest_repeat_test | ||
2971 | 260 | test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc | ||
2972 | 261 | test_gtest_repeat_test_LDADD = lib/libgtest.la | ||
2973 | 262 | |||
2974 | 263 | TESTS += test/gtest_sole_header_test | ||
2975 | 264 | check_PROGRAMS += test/gtest_sole_header_test | ||
2976 | 265 | test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc | ||
2977 | 266 | test_gtest_sole_header_test_LDADD = lib/libgtest_main.la | ||
2978 | 267 | |||
2979 | 268 | TESTS += test/gtest_stress_test | ||
2980 | 269 | check_PROGRAMS += test/gtest_stress_test | ||
2981 | 270 | test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc | ||
2982 | 271 | test_gtest_stress_test_LDADD = lib/libgtest.la | ||
2983 | 272 | |||
2984 | 273 | TESTS += test/gtest-test-part_test | ||
2985 | 274 | check_PROGRAMS += test/gtest-test-part_test | ||
2986 | 275 | test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc | ||
2987 | 276 | test_gtest_test_part_test_LDADD = lib/libgtest_main.la | ||
2988 | 277 | |||
2989 | 278 | TESTS += test/gtest_throw_on_failure_ex_test | ||
2990 | 279 | check_PROGRAMS += test/gtest_throw_on_failure_ex_test | ||
2991 | 280 | test_gtest_throw_on_failure_ex_test_SOURCES = \ | ||
2992 | 281 | test/gtest_throw_on_failure_ex_test.cc \ | ||
2993 | 282 | src/gtest-all.cc | ||
2994 | 283 | test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions | ||
2995 | 284 | |||
2996 | 285 | TESTS += test/gtest-typed-test_test | ||
2997 | 286 | check_PROGRAMS += test/gtest-typed-test_test | ||
2998 | 287 | test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \ | ||
2999 | 288 | test/gtest-typed-test2_test.cc \ | ||
3000 | 289 | test/gtest-typed-test_test.h | ||
3001 | 290 | test_gtest_typed_test_test_LDADD = lib/libgtest_main.la | ||
3002 | 291 | |||
3003 | 292 | TESTS += test/gtest_unittest | ||
3004 | 293 | check_PROGRAMS += test/gtest_unittest | ||
3005 | 294 | test_gtest_unittest_SOURCES = test/gtest_unittest.cc | ||
3006 | 295 | test_gtest_unittest_LDADD = lib/libgtest_main.la | ||
3007 | 296 | |||
3008 | 297 | TESTS += test/gtest-unittest-api_test | ||
3009 | 298 | check_PROGRAMS += test/gtest-unittest-api_test | ||
3010 | 299 | test_gtest_unittest_api_test_SOURCES = test/gtest-unittest-api_test.cc | ||
3011 | 300 | test_gtest_unittest_api_test_LDADD = lib/libgtest_main.la | ||
3012 | 301 | |||
3013 | 302 | # Verifies that Google Test works when RTTI is disabled. | ||
3014 | 303 | TESTS += test/gtest_no_rtti_test | ||
3015 | 304 | check_PROGRAMS += test/gtest_no_rtti_test | ||
3016 | 305 | test_gtest_no_rtti_test_SOURCES = test/gtest_unittest.cc \ | ||
3017 | 306 | src/gtest-all.cc \ | ||
3018 | 307 | src/gtest_main.cc | ||
3019 | 308 | test_gtest_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0 | ||
3020 | 309 | |||
3021 | 310 | # Verifies that Google Test's own TR1 tuple implementation works. | ||
3022 | 311 | TESTS += test/gtest-tuple_test | ||
3023 | 312 | check_PROGRAMS += test/gtest-tuple_test | ||
3024 | 313 | test_gtest_tuple_test_SOURCES = test/gtest-tuple_test.cc \ | ||
3025 | 314 | src/gtest-all.cc \ | ||
3026 | 315 | src/gtest_main.cc | ||
3027 | 316 | test_gtest_tuple_test_CXXFLAGS = $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1 | ||
3028 | 317 | |||
3029 | 318 | # Verifies that Google Test's features that use its own TR1 tuple work. | ||
3030 | 319 | TESTS += test/gtest_use_own_tuple_test | ||
3031 | 320 | check_PROGRAMS += test/gtest_use_own_tuple_test | ||
3032 | 321 | test_gtest_use_own_tuple_test_SOURCES = test/gtest-param-test_test.cc \ | ||
3033 | 322 | test/gtest-param-test2_test.cc \ | ||
3034 | 323 | src/gtest-all.cc | ||
3035 | 324 | test_gtest_use_own_tuple_test_CXXFLAGS = \ | ||
3036 | 325 | $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1 | ||
3037 | 326 | |||
3038 | 327 | # The following tests depend on the presence of a Python installation and are | ||
3039 | 328 | # keyed off of it. TODO(chandlerc@google.com): While we currently only attempt | ||
3040 | 329 | # to build and execute these tests if Autoconf has found Python v2.4 on the | ||
3041 | 330 | # system, we don't use the PYTHON variable it specified as the valid | ||
3042 | 331 | # interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and | ||
3043 | 332 | # thus we cannot distinguish between C++ unit tests and Python unit tests. | ||
3044 | 333 | if HAVE_PYTHON | ||
3045 | 334 | check_SCRIPTS = | ||
3046 | 335 | |||
3047 | 336 | # These two Python modules are used by multiple Python tests below. | ||
3048 | 337 | check_SCRIPTS += test/gtest_test_utils.py \ | ||
3049 | 338 | test/gtest_xml_test_utils.py | ||
3050 | 339 | |||
3051 | 340 | check_PROGRAMS += test/gtest_break_on_failure_unittest_ | ||
3052 | 341 | test_gtest_break_on_failure_unittest__SOURCES = \ | ||
3053 | 342 | test/gtest_break_on_failure_unittest_.cc | ||
3054 | 343 | test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la | ||
3055 | 344 | check_SCRIPTS += test/gtest_break_on_failure_unittest.py | ||
3056 | 345 | TESTS += test/gtest_break_on_failure_unittest.py | ||
3057 | 346 | |||
3058 | 347 | check_PROGRAMS += test/gtest_color_test_ | ||
3059 | 348 | test_gtest_color_test__SOURCES = test/gtest_color_test_.cc | ||
3060 | 349 | test_gtest_color_test__LDADD = lib/libgtest.la | ||
3061 | 350 | check_SCRIPTS += test/gtest_color_test.py | ||
3062 | 351 | TESTS += test/gtest_color_test.py | ||
3063 | 352 | |||
3064 | 353 | check_PROGRAMS += test/gtest_env_var_test_ | ||
3065 | 354 | test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc | ||
3066 | 355 | test_gtest_env_var_test__LDADD = lib/libgtest.la | ||
3067 | 356 | check_SCRIPTS += test/gtest_env_var_test.py | ||
3068 | 357 | TESTS += test/gtest_env_var_test.py | ||
3069 | 358 | |||
3070 | 359 | check_PROGRAMS += test/gtest_filter_unittest_ | ||
3071 | 360 | test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc | ||
3072 | 361 | test_gtest_filter_unittest__LDADD = lib/libgtest.la | ||
3073 | 362 | check_SCRIPTS += test/gtest_filter_unittest.py | ||
3074 | 363 | TESTS += test/gtest_filter_unittest.py | ||
3075 | 364 | |||
3076 | 365 | check_PROGRAMS += test/gtest_help_test_ | ||
3077 | 366 | test_gtest_help_test__SOURCES = test/gtest_help_test_.cc | ||
3078 | 367 | test_gtest_help_test__LDADD = lib/libgtest_main.la | ||
3079 | 368 | check_SCRIPTS += test/gtest_help_test.py | ||
3080 | 369 | TESTS += test/gtest_help_test.py | ||
3081 | 370 | |||
3082 | 371 | check_PROGRAMS += test/gtest_list_tests_unittest_ | ||
3083 | 372 | test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc | ||
3084 | 373 | test_gtest_list_tests_unittest__LDADD = lib/libgtest.la | ||
3085 | 374 | check_SCRIPTS += test/gtest_list_tests_unittest.py | ||
3086 | 375 | TESTS += test/gtest_list_tests_unittest.py | ||
3087 | 376 | |||
3088 | 377 | check_PROGRAMS += test/gtest_output_test_ | ||
3089 | 378 | test_gtest_output_test__SOURCES = test/gtest_output_test_.cc | ||
3090 | 379 | test_gtest_output_test__LDADD = lib/libgtest.la | ||
3091 | 380 | check_SCRIPTS += test/gtest_output_test.py | ||
3092 | 381 | EXTRA_DIST += test/gtest_output_test_golden_lin.txt \ | ||
3093 | 382 | test/gtest_output_test_golden_win.txt | ||
3094 | 383 | TESTS += test/gtest_output_test.py | ||
3095 | 384 | |||
3096 | 385 | check_PROGRAMS += test/gtest_throw_on_failure_test_ | ||
3097 | 386 | test_gtest_throw_on_failure_test__SOURCES = \ | ||
3098 | 387 | test/gtest_throw_on_failure_test_.cc \ | ||
3099 | 388 | src/gtest-all.cc | ||
3100 | 389 | test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions | ||
3101 | 390 | check_SCRIPTS += test/gtest_throw_on_failure_test.py | ||
3102 | 391 | TESTS += test/gtest_throw_on_failure_test.py | ||
3103 | 392 | |||
3104 | 393 | check_PROGRAMS += test/gtest_uninitialized_test_ | ||
3105 | 394 | test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc | ||
3106 | 395 | test_gtest_uninitialized_test__LDADD = lib/libgtest.la | ||
3107 | 396 | check_SCRIPTS += test/gtest_uninitialized_test.py | ||
3108 | 397 | TESTS += test/gtest_uninitialized_test.py | ||
3109 | 398 | |||
3110 | 399 | check_PROGRAMS += test/gtest_xml_outfile1_test_ | ||
3111 | 400 | test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc | ||
3112 | 401 | test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la | ||
3113 | 402 | check_PROGRAMS += test/gtest_xml_outfile2_test_ | ||
3114 | 403 | test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc | ||
3115 | 404 | test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la | ||
3116 | 405 | check_SCRIPTS += test/gtest_xml_outfiles_test.py | ||
3117 | 406 | TESTS += test/gtest_xml_outfiles_test.py | ||
3118 | 407 | |||
3119 | 408 | check_PROGRAMS += test/gtest_xml_output_unittest_ | ||
3120 | 409 | test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc | ||
3121 | 410 | test_gtest_xml_output_unittest__LDADD = lib/libgtest_main.la | ||
3122 | 411 | check_SCRIPTS += test/gtest_xml_output_unittest.py | ||
3123 | 412 | TESTS += test/gtest_xml_output_unittest.py | ||
3124 | 413 | |||
3125 | 414 | # TODO(wan@google.com): make the build script compile and run the | ||
3126 | 415 | # negative-compilation tests. (The test/gtest_nc* files are unfinished | ||
3127 | 416 | # implementation of tests for verifying that certain kinds of misuse | ||
3128 | 417 | # of Google Test don't compile.) | ||
3129 | 418 | EXTRA_DIST += $(check_SCRIPTS) \ | ||
3130 | 419 | test/gtest_nc.cc \ | ||
3131 | 420 | test/gtest_nc_test.py | ||
3132 | 421 | |||
3133 | 422 | endif | ||
3134 | 0 | 423 | ||
3135 | === removed file 'gtest/Makefile.am' | |||
3136 | --- gtest/Makefile.am 2009-06-24 00:19:03 +0000 | |||
3137 | +++ gtest/Makefile.am 1970-01-01 00:00:00 +0000 | |||
3138 | @@ -1,390 +0,0 @@ | |||
3139 | 1 | # Automake file | ||
3140 | 2 | |||
3141 | 3 | # TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump. | ||
3142 | 4 | |||
3143 | 5 | # Nonstandard package files for distribution | ||
3144 | 6 | EXTRA_DIST = \ | ||
3145 | 7 | CHANGES \ | ||
3146 | 8 | CONTRIBUTORS \ | ||
3147 | 9 | include/gtest/gtest-param-test.h.pump \ | ||
3148 | 10 | include/gtest/internal/gtest-type-util.h.pump \ | ||
3149 | 11 | include/gtest/internal/gtest-param-util-generated.h.pump \ | ||
3150 | 12 | make/Makefile \ | ||
3151 | 13 | scons/SConscript \ | ||
3152 | 14 | scripts/fuse_gtest_files.py \ | ||
3153 | 15 | scripts/gen_gtest_pred_impl.py \ | ||
3154 | 16 | scripts/test/Makefile \ | ||
3155 | 17 | test/gtest_all_test.cc | ||
3156 | 18 | |||
3157 | 19 | # MSVC project files | ||
3158 | 20 | EXTRA_DIST += \ | ||
3159 | 21 | msvc/gtest.sln \ | ||
3160 | 22 | msvc/gtest.vcproj \ | ||
3161 | 23 | msvc/gtest_color_test_.vcproj \ | ||
3162 | 24 | msvc/gtest_env_var_test_.vcproj \ | ||
3163 | 25 | msvc/gtest_environment_test.vcproj \ | ||
3164 | 26 | msvc/gtest_main.vcproj \ | ||
3165 | 27 | msvc/gtest_output_test_.vcproj \ | ||
3166 | 28 | msvc/gtest_prod_test.vcproj \ | ||
3167 | 29 | msvc/gtest_uninitialized_test_.vcproj \ | ||
3168 | 30 | msvc/gtest_unittest.vcproj | ||
3169 | 31 | |||
3170 | 32 | # xcode project files | ||
3171 | 33 | EXTRA_DIST += \ | ||
3172 | 34 | xcode/Config/DebugProject.xcconfig \ | ||
3173 | 35 | xcode/Config/FrameworkTarget.xcconfig \ | ||
3174 | 36 | xcode/Config/General.xcconfig \ | ||
3175 | 37 | xcode/Config/ReleaseProject.xcconfig \ | ||
3176 | 38 | xcode/Config/TestTarget.xcconfig \ | ||
3177 | 39 | xcode/Config/InternalTestTarget.xcconfig \ | ||
3178 | 40 | xcode/Config/InternalPythonTestTarget.xcconfig \ | ||
3179 | 41 | xcode/Resources/Info.plist \ | ||
3180 | 42 | xcode/Scripts/versiongenerate.py \ | ||
3181 | 43 | xcode/Scripts/runtests.sh \ | ||
3182 | 44 | xcode/gtest.xcodeproj/project.pbxproj | ||
3183 | 45 | |||
3184 | 46 | # xcode sample files | ||
3185 | 47 | EXTRA_DIST += \ | ||
3186 | 48 | xcode/Samples/FrameworkSample/Info.plist \ | ||
3187 | 49 | xcode/Samples/FrameworkSample/widget_test.cc \ | ||
3188 | 50 | xcode/Samples/FrameworkSample/widget.cc \ | ||
3189 | 51 | xcode/Samples/FrameworkSample/widget.h \ | ||
3190 | 52 | xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj | ||
3191 | 53 | |||
3192 | 54 | # C++Builder project files | ||
3193 | 55 | EXTRA_DIST += \ | ||
3194 | 56 | codegear/gtest_all.cc \ | ||
3195 | 57 | codegear/gtest_link.cc \ | ||
3196 | 58 | codegear/gtest.cbproj \ | ||
3197 | 59 | codegear/gtest_main.cbproj \ | ||
3198 | 60 | codegear/gtest_unittest.cbproj \ | ||
3199 | 61 | codegear/gtest.groupproj | ||
3200 | 62 | |||
3201 | 63 | # TODO(wan@google.com): integrate scripts/gen_gtest_pred_impl.py into | ||
3202 | 64 | # the build system such that a user can specify the maximum predicate | ||
3203 | 65 | # arity here and have the script automatically generate the | ||
3204 | 66 | # corresponding .h and .cc files. | ||
3205 | 67 | |||
3206 | 68 | # Scripts and utilities | ||
3207 | 69 | bin_SCRIPTS = scripts/gtest-config | ||
3208 | 70 | CLEANFILES = $(bin_SCRIPTS) | ||
3209 | 71 | |||
3210 | 72 | # Distribute and install M4 macro | ||
3211 | 73 | m4datadir = $(datadir)/aclocal | ||
3212 | 74 | m4data_DATA = m4/gtest.m4 | ||
3213 | 75 | EXTRA_DIST += $(m4data_DATA) | ||
3214 | 76 | |||
3215 | 77 | # We define the global AM_CPPFLAGS as everything we compile includes from these | ||
3216 | 78 | # directories. | ||
3217 | 79 | AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include | ||
3218 | 80 | |||
3219 | 81 | # Build rules for libraries. | ||
3220 | 82 | lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la | ||
3221 | 83 | |||
3222 | 84 | lib_libgtest_la_SOURCES = src/gtest.cc \ | ||
3223 | 85 | src/gtest-death-test.cc \ | ||
3224 | 86 | src/gtest-filepath.cc \ | ||
3225 | 87 | src/gtest-internal-inl.h \ | ||
3226 | 88 | src/gtest-port.cc \ | ||
3227 | 89 | src/gtest-test-part.cc \ | ||
3228 | 90 | src/gtest-typed-test.cc | ||
3229 | 91 | |||
3230 | 92 | pkginclude_HEADERS = include/gtest/gtest.h \ | ||
3231 | 93 | include/gtest/gtest-death-test.h \ | ||
3232 | 94 | include/gtest/gtest-message.h \ | ||
3233 | 95 | include/gtest/gtest-param-test.h \ | ||
3234 | 96 | include/gtest/gtest_pred_impl.h \ | ||
3235 | 97 | include/gtest/gtest_prod.h \ | ||
3236 | 98 | include/gtest/gtest-spi.h \ | ||
3237 | 99 | include/gtest/gtest-test-part.h \ | ||
3238 | 100 | include/gtest/gtest-typed-test.h | ||
3239 | 101 | |||
3240 | 102 | pkginclude_internaldir = $(pkgincludedir)/internal | ||
3241 | 103 | pkginclude_internal_HEADERS = \ | ||
3242 | 104 | include/gtest/internal/gtest-death-test-internal.h \ | ||
3243 | 105 | include/gtest/internal/gtest-filepath.h \ | ||
3244 | 106 | include/gtest/internal/gtest-internal.h \ | ||
3245 | 107 | include/gtest/internal/gtest-linked_ptr.h \ | ||
3246 | 108 | include/gtest/internal/gtest-param-util-generated.h \ | ||
3247 | 109 | include/gtest/internal/gtest-param-util.h \ | ||
3248 | 110 | include/gtest/internal/gtest-port.h \ | ||
3249 | 111 | include/gtest/internal/gtest-string.h \ | ||
3250 | 112 | include/gtest/internal/gtest-type-util.h | ||
3251 | 113 | |||
3252 | 114 | lib_libgtest_main_la_SOURCES = src/gtest_main.cc | ||
3253 | 115 | lib_libgtest_main_la_LIBADD = lib/libgtest.la | ||
3254 | 116 | |||
3255 | 117 | # Bulid rules for samples and tests. Automake's naming for some of | ||
3256 | 118 | # these variables isn't terribly obvious, so this is a brief | ||
3257 | 119 | # reference: | ||
3258 | 120 | # | ||
3259 | 121 | # TESTS -- Programs run automatically by "make check" | ||
3260 | 122 | # check_PROGRAMS -- Programs built by "make check" but not necessarily run | ||
3261 | 123 | |||
3262 | 124 | noinst_LTLIBRARIES = samples/libsamples.la | ||
3263 | 125 | |||
3264 | 126 | samples_libsamples_la_SOURCES = samples/sample1.cc \ | ||
3265 | 127 | samples/sample1.h \ | ||
3266 | 128 | samples/sample2.cc \ | ||
3267 | 129 | samples/sample2.h \ | ||
3268 | 130 | samples/sample3-inl.h \ | ||
3269 | 131 | samples/sample4.cc \ | ||
3270 | 132 | samples/sample4.h | ||
3271 | 133 | |||
3272 | 134 | TESTS= | ||
3273 | 135 | TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \ | ||
3274 | 136 | GTEST_BUILD_DIR="$(top_builddir)/test" | ||
3275 | 137 | check_PROGRAMS= | ||
3276 | 138 | |||
3277 | 139 | TESTS += samples/sample1_unittest | ||
3278 | 140 | check_PROGRAMS += samples/sample1_unittest | ||
3279 | 141 | samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc | ||
3280 | 142 | samples_sample1_unittest_LDADD = lib/libgtest_main.la \ | ||
3281 | 143 | samples/libsamples.la | ||
3282 | 144 | |||
3283 | 145 | TESTS += samples/sample2_unittest | ||
3284 | 146 | check_PROGRAMS += samples/sample2_unittest | ||
3285 | 147 | samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc | ||
3286 | 148 | samples_sample2_unittest_LDADD = lib/libgtest_main.la \ | ||
3287 | 149 | samples/libsamples.la | ||
3288 | 150 | |||
3289 | 151 | TESTS += samples/sample3_unittest | ||
3290 | 152 | check_PROGRAMS += samples/sample3_unittest | ||
3291 | 153 | samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc | ||
3292 | 154 | samples_sample3_unittest_LDADD = lib/libgtest_main.la \ | ||
3293 | 155 | samples/libsamples.la | ||
3294 | 156 | |||
3295 | 157 | TESTS += samples/sample4_unittest | ||
3296 | 158 | check_PROGRAMS += samples/sample4_unittest | ||
3297 | 159 | samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc | ||
3298 | 160 | samples_sample4_unittest_LDADD = lib/libgtest_main.la \ | ||
3299 | 161 | samples/libsamples.la | ||
3300 | 162 | |||
3301 | 163 | TESTS += samples/sample5_unittest | ||
3302 | 164 | check_PROGRAMS += samples/sample5_unittest | ||
3303 | 165 | samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc | ||
3304 | 166 | samples_sample5_unittest_LDADD = lib/libgtest_main.la \ | ||
3305 | 167 | samples/libsamples.la | ||
3306 | 168 | |||
3307 | 169 | TESTS += samples/sample6_unittest | ||
3308 | 170 | check_PROGRAMS += samples/sample6_unittest | ||
3309 | 171 | samples_sample6_unittest_SOURCES = samples/prime_tables.h \ | ||
3310 | 172 | samples/sample6_unittest.cc | ||
3311 | 173 | samples_sample6_unittest_LDADD = lib/libgtest_main.la \ | ||
3312 | 174 | samples/libsamples.la | ||
3313 | 175 | |||
3314 | 176 | TESTS += samples/sample7_unittest | ||
3315 | 177 | check_PROGRAMS += samples/sample7_unittest | ||
3316 | 178 | samples_sample7_unittest_SOURCES = samples/prime_tables.h \ | ||
3317 | 179 | samples/sample7_unittest.cc | ||
3318 | 180 | samples_sample7_unittest_LDADD = lib/libgtest_main.la \ | ||
3319 | 181 | samples/libsamples.la | ||
3320 | 182 | |||
3321 | 183 | TESTS += samples/sample8_unittest | ||
3322 | 184 | check_PROGRAMS += samples/sample8_unittest | ||
3323 | 185 | samples_sample8_unittest_SOURCES = samples/prime_tables.h \ | ||
3324 | 186 | samples/sample8_unittest.cc | ||
3325 | 187 | samples_sample8_unittest_LDADD = lib/libgtest_main.la \ | ||
3326 | 188 | samples/libsamples.la | ||
3327 | 189 | |||
3328 | 190 | TESTS += test/gtest-death-test_test | ||
3329 | 191 | check_PROGRAMS += test/gtest-death-test_test | ||
3330 | 192 | test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc | ||
3331 | 193 | test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS) | ||
3332 | 194 | test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \ | ||
3333 | 195 | lib/libgtest_main.la | ||
3334 | 196 | |||
3335 | 197 | TESTS += test/gtest_environment_test | ||
3336 | 198 | check_PROGRAMS += test/gtest_environment_test | ||
3337 | 199 | test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc | ||
3338 | 200 | test_gtest_environment_test_LDADD = lib/libgtest.la | ||
3339 | 201 | |||
3340 | 202 | TESTS += test/gtest-filepath_test | ||
3341 | 203 | check_PROGRAMS += test/gtest-filepath_test | ||
3342 | 204 | test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc | ||
3343 | 205 | test_gtest_filepath_test_LDADD = lib/libgtest_main.la | ||
3344 | 206 | |||
3345 | 207 | TESTS += test/gtest-linked_ptr_test | ||
3346 | 208 | check_PROGRAMS += test/gtest-linked_ptr_test | ||
3347 | 209 | test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc | ||
3348 | 210 | test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la | ||
3349 | 211 | |||
3350 | 212 | TESTS += test/gtest_main_unittest | ||
3351 | 213 | check_PROGRAMS += test/gtest_main_unittest | ||
3352 | 214 | test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc | ||
3353 | 215 | test_gtest_main_unittest_LDADD = lib/libgtest_main.la | ||
3354 | 216 | |||
3355 | 217 | TESTS += test/gtest-message_test | ||
3356 | 218 | check_PROGRAMS += test/gtest-message_test | ||
3357 | 219 | test_gtest_message_test_SOURCES = test/gtest-message_test.cc | ||
3358 | 220 | test_gtest_message_test_LDADD = lib/libgtest_main.la | ||
3359 | 221 | |||
3360 | 222 | TESTS += test/gtest_no_test_unittest | ||
3361 | 223 | check_PROGRAMS += test/gtest_no_test_unittest | ||
3362 | 224 | test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc | ||
3363 | 225 | test_gtest_no_test_unittest_LDADD = lib/libgtest.la | ||
3364 | 226 | |||
3365 | 227 | TESTS += test/gtest-options_test | ||
3366 | 228 | check_PROGRAMS += test/gtest-options_test | ||
3367 | 229 | test_gtest_options_test_SOURCES = test/gtest-options_test.cc | ||
3368 | 230 | test_gtest_options_test_LDADD = lib/libgtest_main.la | ||
3369 | 231 | |||
3370 | 232 | TESTS += test/gtest-param-test_test | ||
3371 | 233 | check_PROGRAMS += test/gtest-param-test_test | ||
3372 | 234 | test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \ | ||
3373 | 235 | test/gtest-param-test2_test.cc \ | ||
3374 | 236 | test/gtest-param-test_test.h | ||
3375 | 237 | test_gtest_param_test_test_LDADD = lib/libgtest.la | ||
3376 | 238 | |||
3377 | 239 | TESTS += test/gtest-port_test | ||
3378 | 240 | check_PROGRAMS += test/gtest-port_test | ||
3379 | 241 | test_gtest_port_test_SOURCES = test/gtest-port_test.cc | ||
3380 | 242 | test_gtest_port_test_LDADD = lib/libgtest_main.la | ||
3381 | 243 | |||
3382 | 244 | TESTS += test/gtest_pred_impl_unittest | ||
3383 | 245 | check_PROGRAMS += test/gtest_pred_impl_unittest | ||
3384 | 246 | test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc | ||
3385 | 247 | test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la | ||
3386 | 248 | |||
3387 | 249 | TESTS += test/gtest_prod_test | ||
3388 | 250 | check_PROGRAMS += test/gtest_prod_test | ||
3389 | 251 | test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \ | ||
3390 | 252 | test/production.cc \ | ||
3391 | 253 | test/production.h | ||
3392 | 254 | test_gtest_prod_test_LDADD = lib/libgtest_main.la | ||
3393 | 255 | |||
3394 | 256 | TESTS += test/gtest_repeat_test | ||
3395 | 257 | check_PROGRAMS += test/gtest_repeat_test | ||
3396 | 258 | test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc | ||
3397 | 259 | test_gtest_repeat_test_LDADD = lib/libgtest.la | ||
3398 | 260 | |||
3399 | 261 | TESTS += test/gtest_sole_header_test | ||
3400 | 262 | check_PROGRAMS += test/gtest_sole_header_test | ||
3401 | 263 | test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc | ||
3402 | 264 | test_gtest_sole_header_test_LDADD = lib/libgtest_main.la | ||
3403 | 265 | |||
3404 | 266 | TESTS += test/gtest_stress_test | ||
3405 | 267 | check_PROGRAMS += test/gtest_stress_test | ||
3406 | 268 | test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc | ||
3407 | 269 | test_gtest_stress_test_LDADD = lib/libgtest.la | ||
3408 | 270 | |||
3409 | 271 | TESTS += test/gtest-test-part_test | ||
3410 | 272 | check_PROGRAMS += test/gtest-test-part_test | ||
3411 | 273 | test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc | ||
3412 | 274 | test_gtest_test_part_test_LDADD = lib/libgtest_main.la | ||
3413 | 275 | |||
3414 | 276 | TESTS += test/gtest_throw_on_failure_ex_test | ||
3415 | 277 | check_PROGRAMS += test/gtest_throw_on_failure_ex_test | ||
3416 | 278 | test_gtest_throw_on_failure_ex_test_SOURCES = \ | ||
3417 | 279 | test/gtest_throw_on_failure_ex_test.cc \ | ||
3418 | 280 | src/gtest-all.cc | ||
3419 | 281 | test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions | ||
3420 | 282 | |||
3421 | 283 | TESTS += test/gtest-typed-test_test | ||
3422 | 284 | check_PROGRAMS += test/gtest-typed-test_test | ||
3423 | 285 | test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \ | ||
3424 | 286 | test/gtest-typed-test2_test.cc \ | ||
3425 | 287 | test/gtest-typed-test_test.h | ||
3426 | 288 | test_gtest_typed_test_test_LDADD = lib/libgtest_main.la | ||
3427 | 289 | |||
3428 | 290 | TESTS += test/gtest_unittest | ||
3429 | 291 | check_PROGRAMS += test/gtest_unittest | ||
3430 | 292 | test_gtest_unittest_SOURCES = test/gtest_unittest.cc | ||
3431 | 293 | test_gtest_unittest_LDADD = lib/libgtest_main.la | ||
3432 | 294 | |||
3433 | 295 | # The following tests depend on the presence of a Python installation and are | ||
3434 | 296 | # keyed off of it. TODO(chandlerc@google.com): While we currently only attempt | ||
3435 | 297 | # to build and execute these tests if Autoconf has found Python v2.4 on the | ||
3436 | 298 | # system, we don't use the PYTHON variable it specified as the valid | ||
3437 | 299 | # interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and | ||
3438 | 300 | # thus we cannot distinguish between C++ unit tests and Python unit tests. | ||
3439 | 301 | if HAVE_PYTHON | ||
3440 | 302 | check_SCRIPTS = | ||
3441 | 303 | |||
3442 | 304 | # These two Python modules are used by multiple Python tests below. | ||
3443 | 305 | check_SCRIPTS += test/gtest_test_utils.py \ | ||
3444 | 306 | test/gtest_xml_test_utils.py | ||
3445 | 307 | |||
3446 | 308 | check_PROGRAMS += test/gtest_break_on_failure_unittest_ | ||
3447 | 309 | test_gtest_break_on_failure_unittest__SOURCES = \ | ||
3448 | 310 | test/gtest_break_on_failure_unittest_.cc | ||
3449 | 311 | test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la | ||
3450 | 312 | check_SCRIPTS += test/gtest_break_on_failure_unittest.py | ||
3451 | 313 | TESTS += test/gtest_break_on_failure_unittest.py | ||
3452 | 314 | |||
3453 | 315 | check_PROGRAMS += test/gtest_color_test_ | ||
3454 | 316 | test_gtest_color_test__SOURCES = test/gtest_color_test_.cc | ||
3455 | 317 | test_gtest_color_test__LDADD = lib/libgtest.la | ||
3456 | 318 | check_SCRIPTS += test/gtest_color_test.py | ||
3457 | 319 | TESTS += test/gtest_color_test.py | ||
3458 | 320 | |||
3459 | 321 | check_PROGRAMS += test/gtest_env_var_test_ | ||
3460 | 322 | test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc | ||
3461 | 323 | test_gtest_env_var_test__LDADD = lib/libgtest.la | ||
3462 | 324 | check_SCRIPTS += test/gtest_env_var_test.py | ||
3463 | 325 | TESTS += test/gtest_env_var_test.py | ||
3464 | 326 | |||
3465 | 327 | check_PROGRAMS += test/gtest_filter_unittest_ | ||
3466 | 328 | test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc | ||
3467 | 329 | test_gtest_filter_unittest__LDADD = lib/libgtest.la | ||
3468 | 330 | check_SCRIPTS += test/gtest_filter_unittest.py | ||
3469 | 331 | TESTS += test/gtest_filter_unittest.py | ||
3470 | 332 | |||
3471 | 333 | check_PROGRAMS += test/gtest_help_test_ | ||
3472 | 334 | test_gtest_help_test__SOURCES = test/gtest_help_test_.cc | ||
3473 | 335 | test_gtest_help_test__LDADD = lib/libgtest_main.la | ||
3474 | 336 | check_SCRIPTS += test/gtest_help_test.py | ||
3475 | 337 | TESTS += test/gtest_help_test.py | ||
3476 | 338 | |||
3477 | 339 | check_PROGRAMS += test/gtest_list_tests_unittest_ | ||
3478 | 340 | test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc | ||
3479 | 341 | test_gtest_list_tests_unittest__LDADD = lib/libgtest.la | ||
3480 | 342 | check_SCRIPTS += test/gtest_list_tests_unittest.py | ||
3481 | 343 | TESTS += test/gtest_list_tests_unittest.py | ||
3482 | 344 | |||
3483 | 345 | check_PROGRAMS += test/gtest_output_test_ | ||
3484 | 346 | test_gtest_output_test__SOURCES = test/gtest_output_test_.cc | ||
3485 | 347 | test_gtest_output_test__LDADD = lib/libgtest.la | ||
3486 | 348 | check_SCRIPTS += test/gtest_output_test.py | ||
3487 | 349 | EXTRA_DIST += test/gtest_output_test_golden_lin.txt \ | ||
3488 | 350 | test/gtest_output_test_golden_win.txt | ||
3489 | 351 | TESTS += test/gtest_output_test.py | ||
3490 | 352 | |||
3491 | 353 | check_PROGRAMS += test/gtest_throw_on_failure_test_ | ||
3492 | 354 | test_gtest_throw_on_failure_test__SOURCES = \ | ||
3493 | 355 | test/gtest_throw_on_failure_test_.cc \ | ||
3494 | 356 | src/gtest-all.cc | ||
3495 | 357 | test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions | ||
3496 | 358 | check_SCRIPTS += test/gtest_throw_on_failure_test.py | ||
3497 | 359 | TESTS += test/gtest_throw_on_failure_test.py | ||
3498 | 360 | |||
3499 | 361 | check_PROGRAMS += test/gtest_uninitialized_test_ | ||
3500 | 362 | test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc | ||
3501 | 363 | test_gtest_uninitialized_test__LDADD = lib/libgtest.la | ||
3502 | 364 | check_SCRIPTS += test/gtest_uninitialized_test.py | ||
3503 | 365 | TESTS += test/gtest_uninitialized_test.py | ||
3504 | 366 | |||
3505 | 367 | check_PROGRAMS += test/gtest_xml_outfile1_test_ | ||
3506 | 368 | test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc | ||
3507 | 369 | test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la | ||
3508 | 370 | check_PROGRAMS += test/gtest_xml_outfile2_test_ | ||
3509 | 371 | test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc | ||
3510 | 372 | test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la | ||
3511 | 373 | check_SCRIPTS += test/gtest_xml_outfiles_test.py | ||
3512 | 374 | TESTS += test/gtest_xml_outfiles_test.py | ||
3513 | 375 | |||
3514 | 376 | check_PROGRAMS += test/gtest_xml_output_unittest_ | ||
3515 | 377 | test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc | ||
3516 | 378 | test_gtest_xml_output_unittest__LDADD = lib/libgtest_main.la | ||
3517 | 379 | check_SCRIPTS += test/gtest_xml_output_unittest.py | ||
3518 | 380 | TESTS += test/gtest_xml_output_unittest.py | ||
3519 | 381 | |||
3520 | 382 | # TODO(wan@google.com): make the build script compile and run the | ||
3521 | 383 | # negative-compilation tests. (The test/gtest_nc* files are unfinished | ||
3522 | 384 | # implementation of tests for verifying that certain kinds of misuse | ||
3523 | 385 | # of Google Test don't compile.) | ||
3524 | 386 | EXTRA_DIST += $(check_SCRIPTS) \ | ||
3525 | 387 | test/gtest_nc.cc \ | ||
3526 | 388 | test/gtest_nc_test.py | ||
3527 | 389 | |||
3528 | 390 | endif | ||
3529 | 391 | 0 | ||
3530 | === added file 'gtest/Makefile.in' | |||
3531 | --- gtest/Makefile.in 1970-01-01 00:00:00 +0000 | |||
3532 | +++ gtest/Makefile.in 2010-01-18 04:34:16 +0000 | |||
3533 | @@ -0,0 +1,2202 @@ | |||
3534 | 1 | # Makefile.in generated by automake 1.10.1 from Makefile.am. | ||
3535 | 2 | # @configure_input@ | ||
3536 | 3 | |||
3537 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
3538 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
3539 | 6 | # This Makefile.in is free software; the Free Software Foundation | ||
3540 | 7 | # gives unlimited permission to copy and/or distribute it, | ||
3541 | 8 | # with or without modifications, as long as this notice is preserved. | ||
3542 | 9 | |||
3543 | 10 | # This program is distributed in the hope that it will be useful, | ||
3544 | 11 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
3545 | 12 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
3546 | 13 | # PARTICULAR PURPOSE. | ||
3547 | 14 | |||
3548 | 15 | @SET_MAKE@ | ||
3549 | 16 | |||
3550 | 17 | # Automake file | ||
3551 | 18 | |||
3552 | 19 | # TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump. | ||
3553 | 20 | |||
3554 | 21 | |||
3555 | 22 | |||
3556 | 23 | |||
3557 | 24 | VPATH = @srcdir@ | ||
3558 | 25 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
3559 | 26 | pkglibdir = $(libdir)/@PACKAGE@ | ||
3560 | 27 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
3561 | 28 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
3562 | 29 | install_sh_DATA = $(install_sh) -c -m 644 | ||
3563 | 30 | install_sh_PROGRAM = $(install_sh) -c | ||
3564 | 31 | install_sh_SCRIPT = $(install_sh) -c | ||
3565 | 32 | INSTALL_HEADER = $(INSTALL_DATA) | ||
3566 | 33 | transform = $(program_transform_name) | ||
3567 | 34 | NORMAL_INSTALL = : | ||
3568 | 35 | PRE_INSTALL = : | ||
3569 | 36 | POST_INSTALL = : | ||
3570 | 37 | NORMAL_UNINSTALL = : | ||
3571 | 38 | PRE_UNINSTALL = : | ||
3572 | 39 | POST_UNINSTALL = : | ||
3573 | 40 | build_triplet = @build@ | ||
3574 | 41 | host_triplet = @host@ | ||
3575 | 42 | TESTS = samples/sample1_unittest$(EXEEXT) \ | ||
3576 | 43 | samples/sample2_unittest$(EXEEXT) \ | ||
3577 | 44 | samples/sample3_unittest$(EXEEXT) \ | ||
3578 | 45 | samples/sample4_unittest$(EXEEXT) \ | ||
3579 | 46 | samples/sample5_unittest$(EXEEXT) \ | ||
3580 | 47 | samples/sample6_unittest$(EXEEXT) \ | ||
3581 | 48 | samples/sample7_unittest$(EXEEXT) \ | ||
3582 | 49 | samples/sample8_unittest$(EXEEXT) \ | ||
3583 | 50 | test/gtest-death-test_test$(EXEEXT) \ | ||
3584 | 51 | test/gtest_environment_test$(EXEEXT) \ | ||
3585 | 52 | test/gtest-filepath_test$(EXEEXT) \ | ||
3586 | 53 | test/gtest-linked_ptr_test$(EXEEXT) \ | ||
3587 | 54 | test/gtest_main_unittest$(EXEEXT) \ | ||
3588 | 55 | test/gtest-message_test$(EXEEXT) \ | ||
3589 | 56 | test/gtest_no_test_unittest$(EXEEXT) \ | ||
3590 | 57 | test/gtest-options_test$(EXEEXT) \ | ||
3591 | 58 | test/gtest-param-test_test$(EXEEXT) \ | ||
3592 | 59 | test/gtest-port_test$(EXEEXT) \ | ||
3593 | 60 | test/gtest_pred_impl_unittest$(EXEEXT) \ | ||
3594 | 61 | test/gtest_prod_test$(EXEEXT) test/gtest_repeat_test$(EXEEXT) \ | ||
3595 | 62 | test/gtest_sole_header_test$(EXEEXT) \ | ||
3596 | 63 | test/gtest_stress_test$(EXEEXT) \ | ||
3597 | 64 | test/gtest-test-part_test$(EXEEXT) \ | ||
3598 | 65 | test/gtest_throw_on_failure_ex_test$(EXEEXT) \ | ||
3599 | 66 | test/gtest-typed-test_test$(EXEEXT) \ | ||
3600 | 67 | test/gtest_unittest$(EXEEXT) \ | ||
3601 | 68 | test/gtest-unittest-api_test$(EXEEXT) \ | ||
3602 | 69 | test/gtest_no_rtti_test$(EXEEXT) \ | ||
3603 | 70 | test/gtest-tuple_test$(EXEEXT) \ | ||
3604 | 71 | test/gtest_use_own_tuple_test$(EXEEXT) $(am__append_2) | ||
3605 | 72 | check_PROGRAMS = samples/sample1_unittest$(EXEEXT) \ | ||
3606 | 73 | samples/sample2_unittest$(EXEEXT) \ | ||
3607 | 74 | samples/sample3_unittest$(EXEEXT) \ | ||
3608 | 75 | samples/sample4_unittest$(EXEEXT) \ | ||
3609 | 76 | samples/sample5_unittest$(EXEEXT) \ | ||
3610 | 77 | samples/sample6_unittest$(EXEEXT) \ | ||
3611 | 78 | samples/sample7_unittest$(EXEEXT) \ | ||
3612 | 79 | samples/sample8_unittest$(EXEEXT) \ | ||
3613 | 80 | test/gtest-death-test_test$(EXEEXT) \ | ||
3614 | 81 | test/gtest_environment_test$(EXEEXT) \ | ||
3615 | 82 | test/gtest-filepath_test$(EXEEXT) \ | ||
3616 | 83 | test/gtest-linked_ptr_test$(EXEEXT) \ | ||
3617 | 84 | test/gtest_main_unittest$(EXEEXT) \ | ||
3618 | 85 | test/gtest-message_test$(EXEEXT) \ | ||
3619 | 86 | test/gtest_no_test_unittest$(EXEEXT) \ | ||
3620 | 87 | test/gtest-options_test$(EXEEXT) \ | ||
3621 | 88 | test/gtest-param-test_test$(EXEEXT) \ | ||
3622 | 89 | test/gtest-port_test$(EXEEXT) \ | ||
3623 | 90 | test/gtest_pred_impl_unittest$(EXEEXT) \ | ||
3624 | 91 | test/gtest_prod_test$(EXEEXT) test/gtest_repeat_test$(EXEEXT) \ | ||
3625 | 92 | test/gtest_sole_header_test$(EXEEXT) \ | ||
3626 | 93 | test/gtest_stress_test$(EXEEXT) \ | ||
3627 | 94 | test/gtest-test-part_test$(EXEEXT) \ | ||
3628 | 95 | test/gtest_throw_on_failure_ex_test$(EXEEXT) \ | ||
3629 | 96 | test/gtest-typed-test_test$(EXEEXT) \ | ||
3630 | 97 | test/gtest_unittest$(EXEEXT) \ | ||
3631 | 98 | test/gtest-unittest-api_test$(EXEEXT) \ | ||
3632 | 99 | test/gtest_no_rtti_test$(EXEEXT) \ | ||
3633 | 100 | test/gtest-tuple_test$(EXEEXT) \ | ||
3634 | 101 | test/gtest_use_own_tuple_test$(EXEEXT) $(am__EXEEXT_1) | ||
3635 | 102 | @HAVE_PYTHON_TRUE@am__append_1 = \ | ||
3636 | 103 | @HAVE_PYTHON_TRUE@ test/gtest_break_on_failure_unittest_ \ | ||
3637 | 104 | @HAVE_PYTHON_TRUE@ test/gtest_color_test_ \ | ||
3638 | 105 | @HAVE_PYTHON_TRUE@ test/gtest_env_var_test_ \ | ||
3639 | 106 | @HAVE_PYTHON_TRUE@ test/gtest_filter_unittest_ \ | ||
3640 | 107 | @HAVE_PYTHON_TRUE@ test/gtest_help_test_ \ | ||
3641 | 108 | @HAVE_PYTHON_TRUE@ test/gtest_list_tests_unittest_ \ | ||
3642 | 109 | @HAVE_PYTHON_TRUE@ test/gtest_output_test_ \ | ||
3643 | 110 | @HAVE_PYTHON_TRUE@ test/gtest_throw_on_failure_test_ \ | ||
3644 | 111 | @HAVE_PYTHON_TRUE@ test/gtest_uninitialized_test_ \ | ||
3645 | 112 | @HAVE_PYTHON_TRUE@ test/gtest_xml_outfile1_test_ \ | ||
3646 | 113 | @HAVE_PYTHON_TRUE@ test/gtest_xml_outfile2_test_ \ | ||
3647 | 114 | @HAVE_PYTHON_TRUE@ test/gtest_xml_output_unittest_ | ||
3648 | 115 | @HAVE_PYTHON_TRUE@am__append_2 = \ | ||
3649 | 116 | @HAVE_PYTHON_TRUE@ test/gtest_break_on_failure_unittest.py \ | ||
3650 | 117 | @HAVE_PYTHON_TRUE@ test/gtest_color_test.py \ | ||
3651 | 118 | @HAVE_PYTHON_TRUE@ test/gtest_env_var_test.py \ | ||
3652 | 119 | @HAVE_PYTHON_TRUE@ test/gtest_filter_unittest.py \ | ||
3653 | 120 | @HAVE_PYTHON_TRUE@ test/gtest_help_test.py \ | ||
3654 | 121 | @HAVE_PYTHON_TRUE@ test/gtest_list_tests_unittest.py \ | ||
3655 | 122 | @HAVE_PYTHON_TRUE@ test/gtest_output_test.py \ | ||
3656 | 123 | @HAVE_PYTHON_TRUE@ test/gtest_throw_on_failure_test.py \ | ||
3657 | 124 | @HAVE_PYTHON_TRUE@ test/gtest_uninitialized_test.py \ | ||
3658 | 125 | @HAVE_PYTHON_TRUE@ test/gtest_xml_outfiles_test.py \ | ||
3659 | 126 | @HAVE_PYTHON_TRUE@ test/gtest_xml_output_unittest.py | ||
3660 | 127 | |||
3661 | 128 | # TODO(wan@google.com): make the build script compile and run the | ||
3662 | 129 | # negative-compilation tests. (The test/gtest_nc* files are unfinished | ||
3663 | 130 | # implementation of tests for verifying that certain kinds of misuse | ||
3664 | 131 | # of Google Test don't compile.) | ||
3665 | 132 | @HAVE_PYTHON_TRUE@am__append_3 = \ | ||
3666 | 133 | @HAVE_PYTHON_TRUE@ test/gtest_output_test_golden_lin.txt \ | ||
3667 | 134 | @HAVE_PYTHON_TRUE@ test/gtest_output_test_golden_win.txt \ | ||
3668 | 135 | @HAVE_PYTHON_TRUE@ $(check_SCRIPTS) test/gtest_nc.cc \ | ||
3669 | 136 | @HAVE_PYTHON_TRUE@ test/gtest_nc_test.py | ||
3670 | 137 | subdir = . | ||
3671 | 138 | DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \ | ||
3672 | 139 | $(pkginclude_internal_HEADERS) $(srcdir)/Makefile.am \ | ||
3673 | 140 | $(srcdir)/Makefile.in $(top_srcdir)/build-aux/config.h.in \ | ||
3674 | 141 | $(top_srcdir)/configure $(top_srcdir)/scripts/gtest-config.in \ | ||
3675 | 142 | COPYING build-aux/config.guess build-aux/config.sub \ | ||
3676 | 143 | build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ | ||
3677 | 144 | build-aux/missing | ||
3678 | 145 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
3679 | 146 | am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ | ||
3680 | 147 | $(top_srcdir)/configure.ac | ||
3681 | 148 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
3682 | 149 | $(ACLOCAL_M4) | ||
3683 | 150 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | ||
3684 | 151 | configure.lineno config.status.lineno | ||
3685 | 152 | mkinstalldirs = $(install_sh) -d | ||
3686 | 153 | CONFIG_HEADER = $(top_builddir)/build-aux/config.h | ||
3687 | 154 | CONFIG_CLEAN_FILES = scripts/gtest-config | ||
3688 | 155 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
3689 | 156 | am__vpath_adj = case $$p in \ | ||
3690 | 157 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
3691 | 158 | *) f=$$p;; \ | ||
3692 | 159 | esac; | ||
3693 | 160 | am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | ||
3694 | 161 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ | ||
3695 | 162 | "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgincludedir)" \ | ||
3696 | 163 | "$(DESTDIR)$(pkginclude_internaldir)" | ||
3697 | 164 | libLTLIBRARIES_INSTALL = $(INSTALL) | ||
3698 | 165 | LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) | ||
3699 | 166 | lib_libgtest_la_LIBADD = | ||
3700 | 167 | am__dirstamp = $(am__leading_dot)dirstamp | ||
3701 | 168 | am_lib_libgtest_la_OBJECTS = src/gtest.lo src/gtest-death-test.lo \ | ||
3702 | 169 | src/gtest-filepath.lo src/gtest-port.lo src/gtest-test-part.lo \ | ||
3703 | 170 | src/gtest-typed-test.lo | ||
3704 | 171 | lib_libgtest_la_OBJECTS = $(am_lib_libgtest_la_OBJECTS) | ||
3705 | 172 | lib_libgtest_main_la_DEPENDENCIES = lib/libgtest.la | ||
3706 | 173 | am_lib_libgtest_main_la_OBJECTS = src/gtest_main.lo | ||
3707 | 174 | lib_libgtest_main_la_OBJECTS = $(am_lib_libgtest_main_la_OBJECTS) | ||
3708 | 175 | samples_libsamples_la_LIBADD = | ||
3709 | 176 | am_samples_libsamples_la_OBJECTS = samples/sample1.lo \ | ||
3710 | 177 | samples/sample2.lo samples/sample4.lo | ||
3711 | 178 | samples_libsamples_la_OBJECTS = $(am_samples_libsamples_la_OBJECTS) | ||
3712 | 179 | @HAVE_PYTHON_TRUE@am__EXEEXT_1 = test/gtest_break_on_failure_unittest_$(EXEEXT) \ | ||
3713 | 180 | @HAVE_PYTHON_TRUE@ test/gtest_color_test_$(EXEEXT) \ | ||
3714 | 181 | @HAVE_PYTHON_TRUE@ test/gtest_env_var_test_$(EXEEXT) \ | ||
3715 | 182 | @HAVE_PYTHON_TRUE@ test/gtest_filter_unittest_$(EXEEXT) \ | ||
3716 | 183 | @HAVE_PYTHON_TRUE@ test/gtest_help_test_$(EXEEXT) \ | ||
3717 | 184 | @HAVE_PYTHON_TRUE@ test/gtest_list_tests_unittest_$(EXEEXT) \ | ||
3718 | 185 | @HAVE_PYTHON_TRUE@ test/gtest_output_test_$(EXEEXT) \ | ||
3719 | 186 | @HAVE_PYTHON_TRUE@ test/gtest_throw_on_failure_test_$(EXEEXT) \ | ||
3720 | 187 | @HAVE_PYTHON_TRUE@ test/gtest_uninitialized_test_$(EXEEXT) \ | ||
3721 | 188 | @HAVE_PYTHON_TRUE@ test/gtest_xml_outfile1_test_$(EXEEXT) \ | ||
3722 | 189 | @HAVE_PYTHON_TRUE@ test/gtest_xml_outfile2_test_$(EXEEXT) \ | ||
3723 | 190 | @HAVE_PYTHON_TRUE@ test/gtest_xml_output_unittest_$(EXEEXT) | ||
3724 | 191 | am_samples_sample1_unittest_OBJECTS = \ | ||
3725 | 192 | samples/sample1_unittest.$(OBJEXT) | ||
3726 | 193 | samples_sample1_unittest_OBJECTS = \ | ||
3727 | 194 | $(am_samples_sample1_unittest_OBJECTS) | ||
3728 | 195 | samples_sample1_unittest_DEPENDENCIES = lib/libgtest_main.la \ | ||
3729 | 196 | samples/libsamples.la | ||
3730 | 197 | am_samples_sample2_unittest_OBJECTS = \ | ||
3731 | 198 | samples/sample2_unittest.$(OBJEXT) | ||
3732 | 199 | samples_sample2_unittest_OBJECTS = \ | ||
3733 | 200 | $(am_samples_sample2_unittest_OBJECTS) | ||
3734 | 201 | samples_sample2_unittest_DEPENDENCIES = lib/libgtest_main.la \ | ||
3735 | 202 | samples/libsamples.la | ||
3736 | 203 | am_samples_sample3_unittest_OBJECTS = \ | ||
3737 | 204 | samples/sample3_unittest.$(OBJEXT) | ||
3738 | 205 | samples_sample3_unittest_OBJECTS = \ | ||
3739 | 206 | $(am_samples_sample3_unittest_OBJECTS) | ||
3740 | 207 | samples_sample3_unittest_DEPENDENCIES = lib/libgtest_main.la \ | ||
3741 | 208 | samples/libsamples.la | ||
3742 | 209 | am_samples_sample4_unittest_OBJECTS = \ | ||
3743 | 210 | samples/sample4_unittest.$(OBJEXT) | ||
3744 | 211 | samples_sample4_unittest_OBJECTS = \ | ||
3745 | 212 | $(am_samples_sample4_unittest_OBJECTS) | ||
3746 | 213 | samples_sample4_unittest_DEPENDENCIES = lib/libgtest_main.la \ | ||
3747 | 214 | samples/libsamples.la | ||
3748 | 215 | am_samples_sample5_unittest_OBJECTS = \ | ||
3749 | 216 | samples/sample5_unittest.$(OBJEXT) | ||
3750 | 217 | samples_sample5_unittest_OBJECTS = \ | ||
3751 | 218 | $(am_samples_sample5_unittest_OBJECTS) | ||
3752 | 219 | samples_sample5_unittest_DEPENDENCIES = lib/libgtest_main.la \ | ||
3753 | 220 | samples/libsamples.la | ||
3754 | 221 | am_samples_sample6_unittest_OBJECTS = \ | ||
3755 | 222 | samples/sample6_unittest.$(OBJEXT) | ||
3756 | 223 | samples_sample6_unittest_OBJECTS = \ | ||
3757 | 224 | $(am_samples_sample6_unittest_OBJECTS) | ||
3758 | 225 | samples_sample6_unittest_DEPENDENCIES = lib/libgtest_main.la \ | ||
3759 | 226 | samples/libsamples.la | ||
3760 | 227 | am_samples_sample7_unittest_OBJECTS = \ | ||
3761 | 228 | samples/sample7_unittest.$(OBJEXT) | ||
3762 | 229 | samples_sample7_unittest_OBJECTS = \ | ||
3763 | 230 | $(am_samples_sample7_unittest_OBJECTS) | ||
3764 | 231 | samples_sample7_unittest_DEPENDENCIES = lib/libgtest_main.la \ | ||
3765 | 232 | samples/libsamples.la | ||
3766 | 233 | am_samples_sample8_unittest_OBJECTS = \ | ||
3767 | 234 | samples/sample8_unittest.$(OBJEXT) | ||
3768 | 235 | samples_sample8_unittest_OBJECTS = \ | ||
3769 | 236 | $(am_samples_sample8_unittest_OBJECTS) | ||
3770 | 237 | samples_sample8_unittest_DEPENDENCIES = lib/libgtest_main.la \ | ||
3771 | 238 | samples/libsamples.la | ||
3772 | 239 | am_test_gtest_death_test_test_OBJECTS = test/test_gtest_death_test_test-gtest-death-test_test.$(OBJEXT) | ||
3773 | 240 | test_gtest_death_test_test_OBJECTS = \ | ||
3774 | 241 | $(am_test_gtest_death_test_test_OBJECTS) | ||
3775 | 242 | am__DEPENDENCIES_1 = | ||
3776 | 243 | test_gtest_death_test_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ | ||
3777 | 244 | $(am__DEPENDENCIES_1) lib/libgtest_main.la | ||
3778 | 245 | test_gtest_death_test_test_LINK = $(LIBTOOL) --tag=CXX \ | ||
3779 | 246 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
3780 | 247 | $(test_gtest_death_test_test_CXXFLAGS) $(CXXFLAGS) \ | ||
3781 | 248 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
3782 | 249 | am_test_gtest_filepath_test_OBJECTS = \ | ||
3783 | 250 | test/gtest-filepath_test.$(OBJEXT) | ||
3784 | 251 | test_gtest_filepath_test_OBJECTS = \ | ||
3785 | 252 | $(am_test_gtest_filepath_test_OBJECTS) | ||
3786 | 253 | test_gtest_filepath_test_DEPENDENCIES = lib/libgtest_main.la | ||
3787 | 254 | am_test_gtest_linked_ptr_test_OBJECTS = \ | ||
3788 | 255 | test/gtest-linked_ptr_test.$(OBJEXT) | ||
3789 | 256 | test_gtest_linked_ptr_test_OBJECTS = \ | ||
3790 | 257 | $(am_test_gtest_linked_ptr_test_OBJECTS) | ||
3791 | 258 | test_gtest_linked_ptr_test_DEPENDENCIES = lib/libgtest_main.la | ||
3792 | 259 | am_test_gtest_message_test_OBJECTS = \ | ||
3793 | 260 | test/gtest-message_test.$(OBJEXT) | ||
3794 | 261 | test_gtest_message_test_OBJECTS = \ | ||
3795 | 262 | $(am_test_gtest_message_test_OBJECTS) | ||
3796 | 263 | test_gtest_message_test_DEPENDENCIES = lib/libgtest_main.la | ||
3797 | 264 | am_test_gtest_options_test_OBJECTS = \ | ||
3798 | 265 | test/gtest-options_test.$(OBJEXT) | ||
3799 | 266 | test_gtest_options_test_OBJECTS = \ | ||
3800 | 267 | $(am_test_gtest_options_test_OBJECTS) | ||
3801 | 268 | test_gtest_options_test_DEPENDENCIES = lib/libgtest_main.la | ||
3802 | 269 | am_test_gtest_param_test_test_OBJECTS = \ | ||
3803 | 270 | test/gtest-param-test_test.$(OBJEXT) \ | ||
3804 | 271 | test/gtest-param-test2_test.$(OBJEXT) | ||
3805 | 272 | test_gtest_param_test_test_OBJECTS = \ | ||
3806 | 273 | $(am_test_gtest_param_test_test_OBJECTS) | ||
3807 | 274 | test_gtest_param_test_test_DEPENDENCIES = lib/libgtest.la | ||
3808 | 275 | am_test_gtest_port_test_OBJECTS = test/gtest-port_test.$(OBJEXT) | ||
3809 | 276 | test_gtest_port_test_OBJECTS = $(am_test_gtest_port_test_OBJECTS) | ||
3810 | 277 | test_gtest_port_test_DEPENDENCIES = lib/libgtest_main.la | ||
3811 | 278 | am_test_gtest_test_part_test_OBJECTS = \ | ||
3812 | 279 | test/gtest-test-part_test.$(OBJEXT) | ||
3813 | 280 | test_gtest_test_part_test_OBJECTS = \ | ||
3814 | 281 | $(am_test_gtest_test_part_test_OBJECTS) | ||
3815 | 282 | test_gtest_test_part_test_DEPENDENCIES = lib/libgtest_main.la | ||
3816 | 283 | am_test_gtest_tuple_test_OBJECTS = \ | ||
3817 | 284 | test/test_gtest_tuple_test-gtest-tuple_test.$(OBJEXT) \ | ||
3818 | 285 | src/test_gtest_tuple_test-gtest-all.$(OBJEXT) \ | ||
3819 | 286 | src/test_gtest_tuple_test-gtest_main.$(OBJEXT) | ||
3820 | 287 | test_gtest_tuple_test_OBJECTS = $(am_test_gtest_tuple_test_OBJECTS) | ||
3821 | 288 | test_gtest_tuple_test_LDADD = $(LDADD) | ||
3822 | 289 | test_gtest_tuple_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
3823 | 290 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
3824 | 291 | $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ | ||
3825 | 292 | $(LDFLAGS) -o $@ | ||
3826 | 293 | am_test_gtest_typed_test_test_OBJECTS = \ | ||
3827 | 294 | test/gtest-typed-test_test.$(OBJEXT) \ | ||
3828 | 295 | test/gtest-typed-test2_test.$(OBJEXT) | ||
3829 | 296 | test_gtest_typed_test_test_OBJECTS = \ | ||
3830 | 297 | $(am_test_gtest_typed_test_test_OBJECTS) | ||
3831 | 298 | test_gtest_typed_test_test_DEPENDENCIES = lib/libgtest_main.la | ||
3832 | 299 | am_test_gtest_unittest_api_test_OBJECTS = \ | ||
3833 | 300 | test/gtest-unittest-api_test.$(OBJEXT) | ||
3834 | 301 | test_gtest_unittest_api_test_OBJECTS = \ | ||
3835 | 302 | $(am_test_gtest_unittest_api_test_OBJECTS) | ||
3836 | 303 | test_gtest_unittest_api_test_DEPENDENCIES = lib/libgtest_main.la | ||
3837 | 304 | am__test_gtest_break_on_failure_unittest__SOURCES_DIST = \ | ||
3838 | 305 | test/gtest_break_on_failure_unittest_.cc | ||
3839 | 306 | @HAVE_PYTHON_TRUE@am_test_gtest_break_on_failure_unittest__OBJECTS = test/gtest_break_on_failure_unittest_.$(OBJEXT) | ||
3840 | 307 | test_gtest_break_on_failure_unittest__OBJECTS = \ | ||
3841 | 308 | $(am_test_gtest_break_on_failure_unittest__OBJECTS) | ||
3842 | 309 | @HAVE_PYTHON_TRUE@test_gtest_break_on_failure_unittest__DEPENDENCIES = \ | ||
3843 | 310 | @HAVE_PYTHON_TRUE@ lib/libgtest.la | ||
3844 | 311 | am__test_gtest_color_test__SOURCES_DIST = test/gtest_color_test_.cc | ||
3845 | 312 | @HAVE_PYTHON_TRUE@am_test_gtest_color_test__OBJECTS = \ | ||
3846 | 313 | @HAVE_PYTHON_TRUE@ test/gtest_color_test_.$(OBJEXT) | ||
3847 | 314 | test_gtest_color_test__OBJECTS = $(am_test_gtest_color_test__OBJECTS) | ||
3848 | 315 | @HAVE_PYTHON_TRUE@test_gtest_color_test__DEPENDENCIES = \ | ||
3849 | 316 | @HAVE_PYTHON_TRUE@ lib/libgtest.la | ||
3850 | 317 | am__test_gtest_env_var_test__SOURCES_DIST = \ | ||
3851 | 318 | test/gtest_env_var_test_.cc | ||
3852 | 319 | @HAVE_PYTHON_TRUE@am_test_gtest_env_var_test__OBJECTS = \ | ||
3853 | 320 | @HAVE_PYTHON_TRUE@ test/gtest_env_var_test_.$(OBJEXT) | ||
3854 | 321 | test_gtest_env_var_test__OBJECTS = \ | ||
3855 | 322 | $(am_test_gtest_env_var_test__OBJECTS) | ||
3856 | 323 | @HAVE_PYTHON_TRUE@test_gtest_env_var_test__DEPENDENCIES = \ | ||
3857 | 324 | @HAVE_PYTHON_TRUE@ lib/libgtest.la | ||
3858 | 325 | am_test_gtest_environment_test_OBJECTS = \ | ||
3859 | 326 | test/gtest_environment_test.$(OBJEXT) | ||
3860 | 327 | test_gtest_environment_test_OBJECTS = \ | ||
3861 | 328 | $(am_test_gtest_environment_test_OBJECTS) | ||
3862 | 329 | test_gtest_environment_test_DEPENDENCIES = lib/libgtest.la | ||
3863 | 330 | am__test_gtest_filter_unittest__SOURCES_DIST = \ | ||
3864 | 331 | test/gtest_filter_unittest_.cc | ||
3865 | 332 | @HAVE_PYTHON_TRUE@am_test_gtest_filter_unittest__OBJECTS = \ | ||
3866 | 333 | @HAVE_PYTHON_TRUE@ test/gtest_filter_unittest_.$(OBJEXT) | ||
3867 | 334 | test_gtest_filter_unittest__OBJECTS = \ | ||
3868 | 335 | $(am_test_gtest_filter_unittest__OBJECTS) | ||
3869 | 336 | @HAVE_PYTHON_TRUE@test_gtest_filter_unittest__DEPENDENCIES = \ | ||
3870 | 337 | @HAVE_PYTHON_TRUE@ lib/libgtest.la | ||
3871 | 338 | am__test_gtest_help_test__SOURCES_DIST = test/gtest_help_test_.cc | ||
3872 | 339 | @HAVE_PYTHON_TRUE@am_test_gtest_help_test__OBJECTS = \ | ||
3873 | 340 | @HAVE_PYTHON_TRUE@ test/gtest_help_test_.$(OBJEXT) | ||
3874 | 341 | test_gtest_help_test__OBJECTS = $(am_test_gtest_help_test__OBJECTS) | ||
3875 | 342 | @HAVE_PYTHON_TRUE@test_gtest_help_test__DEPENDENCIES = \ | ||
3876 | 343 | @HAVE_PYTHON_TRUE@ lib/libgtest_main.la | ||
3877 | 344 | am__test_gtest_list_tests_unittest__SOURCES_DIST = \ | ||
3878 | 345 | test/gtest_list_tests_unittest_.cc | ||
3879 | 346 | @HAVE_PYTHON_TRUE@am_test_gtest_list_tests_unittest__OBJECTS = \ | ||
3880 | 347 | @HAVE_PYTHON_TRUE@ test/gtest_list_tests_unittest_.$(OBJEXT) | ||
3881 | 348 | test_gtest_list_tests_unittest__OBJECTS = \ | ||
3882 | 349 | $(am_test_gtest_list_tests_unittest__OBJECTS) | ||
3883 | 350 | @HAVE_PYTHON_TRUE@test_gtest_list_tests_unittest__DEPENDENCIES = \ | ||
3884 | 351 | @HAVE_PYTHON_TRUE@ lib/libgtest.la | ||
3885 | 352 | am_test_gtest_main_unittest_OBJECTS = \ | ||
3886 | 353 | test/gtest_main_unittest.$(OBJEXT) | ||
3887 | 354 | test_gtest_main_unittest_OBJECTS = \ | ||
3888 | 355 | $(am_test_gtest_main_unittest_OBJECTS) | ||
3889 | 356 | test_gtest_main_unittest_DEPENDENCIES = lib/libgtest_main.la | ||
3890 | 357 | am_test_gtest_no_rtti_test_OBJECTS = \ | ||
3891 | 358 | test/test_gtest_no_rtti_test-gtest_unittest.$(OBJEXT) \ | ||
3892 | 359 | src/test_gtest_no_rtti_test-gtest-all.$(OBJEXT) \ | ||
3893 | 360 | src/test_gtest_no_rtti_test-gtest_main.$(OBJEXT) | ||
3894 | 361 | test_gtest_no_rtti_test_OBJECTS = \ | ||
3895 | 362 | $(am_test_gtest_no_rtti_test_OBJECTS) | ||
3896 | 363 | test_gtest_no_rtti_test_LDADD = $(LDADD) | ||
3897 | 364 | test_gtest_no_rtti_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | ||
3898 | 365 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
3899 | 366 | $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ | ||
3900 | 367 | $(LDFLAGS) -o $@ | ||
3901 | 368 | am_test_gtest_no_test_unittest_OBJECTS = \ | ||
3902 | 369 | test/gtest_no_test_unittest.$(OBJEXT) | ||
3903 | 370 | test_gtest_no_test_unittest_OBJECTS = \ | ||
3904 | 371 | $(am_test_gtest_no_test_unittest_OBJECTS) | ||
3905 | 372 | test_gtest_no_test_unittest_DEPENDENCIES = lib/libgtest.la | ||
3906 | 373 | am__test_gtest_output_test__SOURCES_DIST = test/gtest_output_test_.cc | ||
3907 | 374 | @HAVE_PYTHON_TRUE@am_test_gtest_output_test__OBJECTS = \ | ||
3908 | 375 | @HAVE_PYTHON_TRUE@ test/gtest_output_test_.$(OBJEXT) | ||
3909 | 376 | test_gtest_output_test__OBJECTS = \ | ||
3910 | 377 | $(am_test_gtest_output_test__OBJECTS) | ||
3911 | 378 | @HAVE_PYTHON_TRUE@test_gtest_output_test__DEPENDENCIES = \ | ||
3912 | 379 | @HAVE_PYTHON_TRUE@ lib/libgtest.la | ||
3913 | 380 | am_test_gtest_pred_impl_unittest_OBJECTS = \ | ||
3914 | 381 | test/gtest_pred_impl_unittest.$(OBJEXT) | ||
3915 | 382 | test_gtest_pred_impl_unittest_OBJECTS = \ | ||
3916 | 383 | $(am_test_gtest_pred_impl_unittest_OBJECTS) | ||
3917 | 384 | test_gtest_pred_impl_unittest_DEPENDENCIES = lib/libgtest_main.la | ||
3918 | 385 | am_test_gtest_prod_test_OBJECTS = test/gtest_prod_test.$(OBJEXT) \ | ||
3919 | 386 | test/production.$(OBJEXT) | ||
3920 | 387 | test_gtest_prod_test_OBJECTS = $(am_test_gtest_prod_test_OBJECTS) | ||
3921 | 388 | test_gtest_prod_test_DEPENDENCIES = lib/libgtest_main.la | ||
3922 | 389 | am_test_gtest_repeat_test_OBJECTS = test/gtest_repeat_test.$(OBJEXT) | ||
3923 | 390 | test_gtest_repeat_test_OBJECTS = $(am_test_gtest_repeat_test_OBJECTS) | ||
3924 | 391 | test_gtest_repeat_test_DEPENDENCIES = lib/libgtest.la | ||
3925 | 392 | am_test_gtest_sole_header_test_OBJECTS = \ | ||
3926 | 393 | test/gtest_sole_header_test.$(OBJEXT) | ||
3927 | 394 | test_gtest_sole_header_test_OBJECTS = \ | ||
3928 | 395 | $(am_test_gtest_sole_header_test_OBJECTS) | ||
3929 | 396 | test_gtest_sole_header_test_DEPENDENCIES = lib/libgtest_main.la | ||
3930 | 397 | am_test_gtest_stress_test_OBJECTS = test/gtest_stress_test.$(OBJEXT) | ||
3931 | 398 | test_gtest_stress_test_OBJECTS = $(am_test_gtest_stress_test_OBJECTS) | ||
3932 | 399 | test_gtest_stress_test_DEPENDENCIES = lib/libgtest.la | ||
3933 | 400 | am_test_gtest_throw_on_failure_ex_test_OBJECTS = test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.$(OBJEXT) \ | ||
3934 | 401 | src/test_gtest_throw_on_failure_ex_test-gtest-all.$(OBJEXT) | ||
3935 | 402 | test_gtest_throw_on_failure_ex_test_OBJECTS = \ | ||
3936 | 403 | $(am_test_gtest_throw_on_failure_ex_test_OBJECTS) | ||
3937 | 404 | test_gtest_throw_on_failure_ex_test_LDADD = $(LDADD) | ||
3938 | 405 | test_gtest_throw_on_failure_ex_test_LINK = $(LIBTOOL) --tag=CXX \ | ||
3939 | 406 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
3940 | 407 | $(test_gtest_throw_on_failure_ex_test_CXXFLAGS) $(CXXFLAGS) \ | ||
3941 | 408 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
3942 | 409 | am__test_gtest_throw_on_failure_test__SOURCES_DIST = \ | ||
3943 | 410 | test/gtest_throw_on_failure_test_.cc src/gtest-all.cc | ||
3944 | 411 | @HAVE_PYTHON_TRUE@am_test_gtest_throw_on_failure_test__OBJECTS = test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.$(OBJEXT) \ | ||
3945 | 412 | @HAVE_PYTHON_TRUE@ src/test_gtest_throw_on_failure_test_-gtest-all.$(OBJEXT) | ||
3946 | 413 | test_gtest_throw_on_failure_test__OBJECTS = \ | ||
3947 | 414 | $(am_test_gtest_throw_on_failure_test__OBJECTS) | ||
3948 | 415 | test_gtest_throw_on_failure_test__LDADD = $(LDADD) | ||
3949 | 416 | test_gtest_throw_on_failure_test__LINK = $(LIBTOOL) --tag=CXX \ | ||
3950 | 417 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
3951 | 418 | $(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) \ | ||
3952 | 419 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
3953 | 420 | am__test_gtest_uninitialized_test__SOURCES_DIST = \ | ||
3954 | 421 | test/gtest_uninitialized_test_.cc | ||
3955 | 422 | @HAVE_PYTHON_TRUE@am_test_gtest_uninitialized_test__OBJECTS = \ | ||
3956 | 423 | @HAVE_PYTHON_TRUE@ test/gtest_uninitialized_test_.$(OBJEXT) | ||
3957 | 424 | test_gtest_uninitialized_test__OBJECTS = \ | ||
3958 | 425 | $(am_test_gtest_uninitialized_test__OBJECTS) | ||
3959 | 426 | @HAVE_PYTHON_TRUE@test_gtest_uninitialized_test__DEPENDENCIES = \ | ||
3960 | 427 | @HAVE_PYTHON_TRUE@ lib/libgtest.la | ||
3961 | 428 | am_test_gtest_unittest_OBJECTS = test/gtest_unittest.$(OBJEXT) | ||
3962 | 429 | test_gtest_unittest_OBJECTS = $(am_test_gtest_unittest_OBJECTS) | ||
3963 | 430 | test_gtest_unittest_DEPENDENCIES = lib/libgtest_main.la | ||
3964 | 431 | am_test_gtest_use_own_tuple_test_OBJECTS = test/test_gtest_use_own_tuple_test-gtest-param-test_test.$(OBJEXT) \ | ||
3965 | 432 | test/test_gtest_use_own_tuple_test-gtest-param-test2_test.$(OBJEXT) \ | ||
3966 | 433 | src/test_gtest_use_own_tuple_test-gtest-all.$(OBJEXT) | ||
3967 | 434 | test_gtest_use_own_tuple_test_OBJECTS = \ | ||
3968 | 435 | $(am_test_gtest_use_own_tuple_test_OBJECTS) | ||
3969 | 436 | test_gtest_use_own_tuple_test_LDADD = $(LDADD) | ||
3970 | 437 | test_gtest_use_own_tuple_test_LINK = $(LIBTOOL) --tag=CXX \ | ||
3971 | 438 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ | ||
3972 | 439 | $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) \ | ||
3973 | 440 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
3974 | 441 | am__test_gtest_xml_outfile1_test__SOURCES_DIST = \ | ||
3975 | 442 | test/gtest_xml_outfile1_test_.cc | ||
3976 | 443 | @HAVE_PYTHON_TRUE@am_test_gtest_xml_outfile1_test__OBJECTS = \ | ||
3977 | 444 | @HAVE_PYTHON_TRUE@ test/gtest_xml_outfile1_test_.$(OBJEXT) | ||
3978 | 445 | test_gtest_xml_outfile1_test__OBJECTS = \ | ||
3979 | 446 | $(am_test_gtest_xml_outfile1_test__OBJECTS) | ||
3980 | 447 | @HAVE_PYTHON_TRUE@test_gtest_xml_outfile1_test__DEPENDENCIES = \ | ||
3981 | 448 | @HAVE_PYTHON_TRUE@ lib/libgtest_main.la | ||
3982 | 449 | am__test_gtest_xml_outfile2_test__SOURCES_DIST = \ | ||
3983 | 450 | test/gtest_xml_outfile2_test_.cc | ||
3984 | 451 | @HAVE_PYTHON_TRUE@am_test_gtest_xml_outfile2_test__OBJECTS = \ | ||
3985 | 452 | @HAVE_PYTHON_TRUE@ test/gtest_xml_outfile2_test_.$(OBJEXT) | ||
3986 | 453 | test_gtest_xml_outfile2_test__OBJECTS = \ | ||
3987 | 454 | $(am_test_gtest_xml_outfile2_test__OBJECTS) | ||
3988 | 455 | @HAVE_PYTHON_TRUE@test_gtest_xml_outfile2_test__DEPENDENCIES = \ | ||
3989 | 456 | @HAVE_PYTHON_TRUE@ lib/libgtest_main.la | ||
3990 | 457 | am__test_gtest_xml_output_unittest__SOURCES_DIST = \ | ||
3991 | 458 | test/gtest_xml_output_unittest_.cc | ||
3992 | 459 | @HAVE_PYTHON_TRUE@am_test_gtest_xml_output_unittest__OBJECTS = \ | ||
3993 | 460 | @HAVE_PYTHON_TRUE@ test/gtest_xml_output_unittest_.$(OBJEXT) | ||
3994 | 461 | test_gtest_xml_output_unittest__OBJECTS = \ | ||
3995 | 462 | $(am_test_gtest_xml_output_unittest__OBJECTS) | ||
3996 | 463 | @HAVE_PYTHON_TRUE@test_gtest_xml_output_unittest__DEPENDENCIES = \ | ||
3997 | 464 | @HAVE_PYTHON_TRUE@ lib/libgtest_main.la | ||
3998 | 465 | binSCRIPT_INSTALL = $(INSTALL_SCRIPT) | ||
3999 | 466 | SCRIPTS = $(bin_SCRIPTS) | ||
4000 | 467 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/build-aux | ||
4001 | 468 | depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp | ||
4002 | 469 | am__depfiles_maybe = depfiles | ||
4003 | 470 | CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
4004 | 471 | $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) | ||
4005 | 472 | LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
4006 | 473 | --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
4007 | 474 | $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) | ||
4008 | 475 | CXXLD = $(CXX) | ||
4009 | 476 | CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
4010 | 477 | --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ | ||
4011 | 478 | $(LDFLAGS) -o $@ | ||
4012 | 479 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
4013 | 480 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
4014 | 481 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
4015 | 482 | --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
4016 | 483 | $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
4017 | 484 | CCLD = $(CC) | ||
4018 | 485 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
4019 | 486 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
4020 | 487 | $(LDFLAGS) -o $@ | ||
4021 | 488 | SOURCES = $(lib_libgtest_la_SOURCES) $(lib_libgtest_main_la_SOURCES) \ | ||
4022 | 489 | $(samples_libsamples_la_SOURCES) \ | ||
4023 | 490 | $(samples_sample1_unittest_SOURCES) \ | ||
4024 | 491 | $(samples_sample2_unittest_SOURCES) \ | ||
4025 | 492 | $(samples_sample3_unittest_SOURCES) \ | ||
4026 | 493 | $(samples_sample4_unittest_SOURCES) \ | ||
4027 | 494 | $(samples_sample5_unittest_SOURCES) \ | ||
4028 | 495 | $(samples_sample6_unittest_SOURCES) \ | ||
4029 | 496 | $(samples_sample7_unittest_SOURCES) \ | ||
4030 | 497 | $(samples_sample8_unittest_SOURCES) \ | ||
4031 | 498 | $(test_gtest_death_test_test_SOURCES) \ | ||
4032 | 499 | $(test_gtest_filepath_test_SOURCES) \ | ||
4033 | 500 | $(test_gtest_linked_ptr_test_SOURCES) \ | ||
4034 | 501 | $(test_gtest_message_test_SOURCES) \ | ||
4035 | 502 | $(test_gtest_options_test_SOURCES) \ | ||
4036 | 503 | $(test_gtest_param_test_test_SOURCES) \ | ||
4037 | 504 | $(test_gtest_port_test_SOURCES) \ | ||
4038 | 505 | $(test_gtest_test_part_test_SOURCES) \ | ||
4039 | 506 | $(test_gtest_tuple_test_SOURCES) \ | ||
4040 | 507 | $(test_gtest_typed_test_test_SOURCES) \ | ||
4041 | 508 | $(test_gtest_unittest_api_test_SOURCES) \ | ||
4042 | 509 | $(test_gtest_break_on_failure_unittest__SOURCES) \ | ||
4043 | 510 | $(test_gtest_color_test__SOURCES) \ | ||
4044 | 511 | $(test_gtest_env_var_test__SOURCES) \ | ||
4045 | 512 | $(test_gtest_environment_test_SOURCES) \ | ||
4046 | 513 | $(test_gtest_filter_unittest__SOURCES) \ | ||
4047 | 514 | $(test_gtest_help_test__SOURCES) \ | ||
4048 | 515 | $(test_gtest_list_tests_unittest__SOURCES) \ | ||
4049 | 516 | $(test_gtest_main_unittest_SOURCES) \ | ||
4050 | 517 | $(test_gtest_no_rtti_test_SOURCES) \ | ||
4051 | 518 | $(test_gtest_no_test_unittest_SOURCES) \ | ||
4052 | 519 | $(test_gtest_output_test__SOURCES) \ | ||
4053 | 520 | $(test_gtest_pred_impl_unittest_SOURCES) \ | ||
4054 | 521 | $(test_gtest_prod_test_SOURCES) \ | ||
4055 | 522 | $(test_gtest_repeat_test_SOURCES) \ | ||
4056 | 523 | $(test_gtest_sole_header_test_SOURCES) \ | ||
4057 | 524 | $(test_gtest_stress_test_SOURCES) \ | ||
4058 | 525 | $(test_gtest_throw_on_failure_ex_test_SOURCES) \ | ||
4059 | 526 | $(test_gtest_throw_on_failure_test__SOURCES) \ | ||
4060 | 527 | $(test_gtest_uninitialized_test__SOURCES) \ | ||
4061 | 528 | $(test_gtest_unittest_SOURCES) \ | ||
4062 | 529 | $(test_gtest_use_own_tuple_test_SOURCES) \ | ||
4063 | 530 | $(test_gtest_xml_outfile1_test__SOURCES) \ | ||
4064 | 531 | $(test_gtest_xml_outfile2_test__SOURCES) \ | ||
4065 | 532 | $(test_gtest_xml_output_unittest__SOURCES) | ||
4066 | 533 | DIST_SOURCES = $(lib_libgtest_la_SOURCES) \ | ||
4067 | 534 | $(lib_libgtest_main_la_SOURCES) \ | ||
4068 | 535 | $(samples_libsamples_la_SOURCES) \ | ||
4069 | 536 | $(samples_sample1_unittest_SOURCES) \ | ||
4070 | 537 | $(samples_sample2_unittest_SOURCES) \ | ||
4071 | 538 | $(samples_sample3_unittest_SOURCES) \ | ||
4072 | 539 | $(samples_sample4_unittest_SOURCES) \ | ||
4073 | 540 | $(samples_sample5_unittest_SOURCES) \ | ||
4074 | 541 | $(samples_sample6_unittest_SOURCES) \ | ||
4075 | 542 | $(samples_sample7_unittest_SOURCES) \ | ||
4076 | 543 | $(samples_sample8_unittest_SOURCES) \ | ||
4077 | 544 | $(test_gtest_death_test_test_SOURCES) \ | ||
4078 | 545 | $(test_gtest_filepath_test_SOURCES) \ | ||
4079 | 546 | $(test_gtest_linked_ptr_test_SOURCES) \ | ||
4080 | 547 | $(test_gtest_message_test_SOURCES) \ | ||
4081 | 548 | $(test_gtest_options_test_SOURCES) \ | ||
4082 | 549 | $(test_gtest_param_test_test_SOURCES) \ | ||
4083 | 550 | $(test_gtest_port_test_SOURCES) \ | ||
4084 | 551 | $(test_gtest_test_part_test_SOURCES) \ | ||
4085 | 552 | $(test_gtest_tuple_test_SOURCES) \ | ||
4086 | 553 | $(test_gtest_typed_test_test_SOURCES) \ | ||
4087 | 554 | $(test_gtest_unittest_api_test_SOURCES) \ | ||
4088 | 555 | $(am__test_gtest_break_on_failure_unittest__SOURCES_DIST) \ | ||
4089 | 556 | $(am__test_gtest_color_test__SOURCES_DIST) \ | ||
4090 | 557 | $(am__test_gtest_env_var_test__SOURCES_DIST) \ | ||
4091 | 558 | $(test_gtest_environment_test_SOURCES) \ | ||
4092 | 559 | $(am__test_gtest_filter_unittest__SOURCES_DIST) \ | ||
4093 | 560 | $(am__test_gtest_help_test__SOURCES_DIST) \ | ||
4094 | 561 | $(am__test_gtest_list_tests_unittest__SOURCES_DIST) \ | ||
4095 | 562 | $(test_gtest_main_unittest_SOURCES) \ | ||
4096 | 563 | $(test_gtest_no_rtti_test_SOURCES) \ | ||
4097 | 564 | $(test_gtest_no_test_unittest_SOURCES) \ | ||
4098 | 565 | $(am__test_gtest_output_test__SOURCES_DIST) \ | ||
4099 | 566 | $(test_gtest_pred_impl_unittest_SOURCES) \ | ||
4100 | 567 | $(test_gtest_prod_test_SOURCES) \ | ||
4101 | 568 | $(test_gtest_repeat_test_SOURCES) \ | ||
4102 | 569 | $(test_gtest_sole_header_test_SOURCES) \ | ||
4103 | 570 | $(test_gtest_stress_test_SOURCES) \ | ||
4104 | 571 | $(test_gtest_throw_on_failure_ex_test_SOURCES) \ | ||
4105 | 572 | $(am__test_gtest_throw_on_failure_test__SOURCES_DIST) \ | ||
4106 | 573 | $(am__test_gtest_uninitialized_test__SOURCES_DIST) \ | ||
4107 | 574 | $(test_gtest_unittest_SOURCES) \ | ||
4108 | 575 | $(test_gtest_use_own_tuple_test_SOURCES) \ | ||
4109 | 576 | $(am__test_gtest_xml_outfile1_test__SOURCES_DIST) \ | ||
4110 | 577 | $(am__test_gtest_xml_outfile2_test__SOURCES_DIST) \ | ||
4111 | 578 | $(am__test_gtest_xml_output_unittest__SOURCES_DIST) | ||
4112 | 579 | m4dataDATA_INSTALL = $(INSTALL_DATA) | ||
4113 | 580 | DATA = $(m4data_DATA) | ||
4114 | 581 | pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) | ||
4115 | 582 | pkginclude_internalHEADERS_INSTALL = $(INSTALL_HEADER) | ||
4116 | 583 | HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) | ||
4117 | 584 | ETAGS = etags | ||
4118 | 585 | CTAGS = ctags | ||
4119 | 586 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
4120 | 587 | distdir = $(PACKAGE)-$(VERSION) | ||
4121 | 588 | top_distdir = $(distdir) | ||
4122 | 589 | am__remove_distdir = \ | ||
4123 | 590 | { test ! -d $(distdir) \ | ||
4124 | 591 | || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ | ||
4125 | 592 | && rm -fr $(distdir); }; } | ||
4126 | 593 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip | ||
4127 | 594 | GZIP_ENV = --best | ||
4128 | 595 | distuninstallcheck_listfiles = find . -type f -print | ||
4129 | 596 | distcleancheck_listfiles = find . -type f -print | ||
4130 | 597 | ACLOCAL = @ACLOCAL@ | ||
4131 | 598 | AMTAR = @AMTAR@ | ||
4132 | 599 | AR = @AR@ | ||
4133 | 600 | AUTOCONF = @AUTOCONF@ | ||
4134 | 601 | AUTOHEADER = @AUTOHEADER@ | ||
4135 | 602 | AUTOMAKE = @AUTOMAKE@ | ||
4136 | 603 | AWK = @AWK@ | ||
4137 | 604 | CC = @CC@ | ||
4138 | 605 | CCDEPMODE = @CCDEPMODE@ | ||
4139 | 606 | CFLAGS = @CFLAGS@ | ||
4140 | 607 | CPP = @CPP@ | ||
4141 | 608 | CPPFLAGS = @CPPFLAGS@ | ||
4142 | 609 | CXX = @CXX@ | ||
4143 | 610 | CXXCPP = @CXXCPP@ | ||
4144 | 611 | CXXDEPMODE = @CXXDEPMODE@ | ||
4145 | 612 | CXXFLAGS = @CXXFLAGS@ | ||
4146 | 613 | CYGPATH_W = @CYGPATH_W@ | ||
4147 | 614 | DEFS = @DEFS@ | ||
4148 | 615 | DEPDIR = @DEPDIR@ | ||
4149 | 616 | DSYMUTIL = @DSYMUTIL@ | ||
4150 | 617 | DUMPBIN = @DUMPBIN@ | ||
4151 | 618 | ECHO_C = @ECHO_C@ | ||
4152 | 619 | ECHO_N = @ECHO_N@ | ||
4153 | 620 | ECHO_T = @ECHO_T@ | ||
4154 | 621 | EGREP = @EGREP@ | ||
4155 | 622 | EXEEXT = @EXEEXT@ | ||
4156 | 623 | FGREP = @FGREP@ | ||
4157 | 624 | GREP = @GREP@ | ||
4158 | 625 | INSTALL = @INSTALL@ | ||
4159 | 626 | INSTALL_DATA = @INSTALL_DATA@ | ||
4160 | 627 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | ||
4161 | 628 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | ||
4162 | 629 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | ||
4163 | 630 | LD = @LD@ | ||
4164 | 631 | LDFLAGS = @LDFLAGS@ | ||
4165 | 632 | LIBOBJS = @LIBOBJS@ | ||
4166 | 633 | LIBS = @LIBS@ | ||
4167 | 634 | LIBTOOL = @LIBTOOL@ | ||
4168 | 635 | LIPO = @LIPO@ | ||
4169 | 636 | LN_S = @LN_S@ | ||
4170 | 637 | LTLIBOBJS = @LTLIBOBJS@ | ||
4171 | 638 | MAKEINFO = @MAKEINFO@ | ||
4172 | 639 | MKDIR_P = @MKDIR_P@ | ||
4173 | 640 | NM = @NM@ | ||
4174 | 641 | NMEDIT = @NMEDIT@ | ||
4175 | 642 | OBJEXT = @OBJEXT@ | ||
4176 | 643 | OTOOL = @OTOOL@ | ||
4177 | 644 | OTOOL64 = @OTOOL64@ | ||
4178 | 645 | PACKAGE = @PACKAGE@ | ||
4179 | 646 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
4180 | 647 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
4181 | 648 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
4182 | 649 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
4183 | 650 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
4184 | 651 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
4185 | 652 | PTHREAD_CC = @PTHREAD_CC@ | ||
4186 | 653 | PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ | ||
4187 | 654 | PTHREAD_LIBS = @PTHREAD_LIBS@ | ||
4188 | 655 | PYTHON = @PYTHON@ | ||
4189 | 656 | RANLIB = @RANLIB@ | ||
4190 | 657 | SED = @SED@ | ||
4191 | 658 | SET_MAKE = @SET_MAKE@ | ||
4192 | 659 | SHELL = @SHELL@ | ||
4193 | 660 | STRIP = @STRIP@ | ||
4194 | 661 | VERSION = @VERSION@ | ||
4195 | 662 | abs_builddir = @abs_builddir@ | ||
4196 | 663 | abs_srcdir = @abs_srcdir@ | ||
4197 | 664 | abs_top_builddir = @abs_top_builddir@ | ||
4198 | 665 | abs_top_srcdir = @abs_top_srcdir@ | ||
4199 | 666 | ac_ct_CC = @ac_ct_CC@ | ||
4200 | 667 | ac_ct_CXX = @ac_ct_CXX@ | ||
4201 | 668 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
4202 | 669 | acx_pthread_config = @acx_pthread_config@ | ||
4203 | 670 | am__include = @am__include@ | ||
4204 | 671 | am__leading_dot = @am__leading_dot@ | ||
4205 | 672 | am__quote = @am__quote@ | ||
4206 | 673 | am__tar = @am__tar@ | ||
4207 | 674 | am__untar = @am__untar@ | ||
4208 | 675 | bindir = @bindir@ | ||
4209 | 676 | build = @build@ | ||
4210 | 677 | build_alias = @build_alias@ | ||
4211 | 678 | build_cpu = @build_cpu@ | ||
4212 | 679 | build_os = @build_os@ | ||
4213 | 680 | build_vendor = @build_vendor@ | ||
4214 | 681 | builddir = @builddir@ | ||
4215 | 682 | datadir = @datadir@ | ||
4216 | 683 | datarootdir = @datarootdir@ | ||
4217 | 684 | docdir = @docdir@ | ||
4218 | 685 | dvidir = @dvidir@ | ||
4219 | 686 | exec_prefix = @exec_prefix@ | ||
4220 | 687 | host = @host@ | ||
4221 | 688 | host_alias = @host_alias@ | ||
4222 | 689 | host_cpu = @host_cpu@ | ||
4223 | 690 | host_os = @host_os@ | ||
4224 | 691 | host_vendor = @host_vendor@ | ||
4225 | 692 | htmldir = @htmldir@ | ||
4226 | 693 | includedir = @includedir@ | ||
4227 | 694 | infodir = @infodir@ | ||
4228 | 695 | install_sh = @install_sh@ | ||
4229 | 696 | libdir = @libdir@ | ||
4230 | 697 | libexecdir = @libexecdir@ | ||
4231 | 698 | localedir = @localedir@ | ||
4232 | 699 | localstatedir = @localstatedir@ | ||
4233 | 700 | lt_ECHO = @lt_ECHO@ | ||
4234 | 701 | mandir = @mandir@ | ||
4235 | 702 | mkdir_p = @mkdir_p@ | ||
4236 | 703 | oldincludedir = @oldincludedir@ | ||
4237 | 704 | pdfdir = @pdfdir@ | ||
4238 | 705 | prefix = @prefix@ | ||
4239 | 706 | program_transform_name = @program_transform_name@ | ||
4240 | 707 | psdir = @psdir@ | ||
4241 | 708 | sbindir = @sbindir@ | ||
4242 | 709 | sharedstatedir = @sharedstatedir@ | ||
4243 | 710 | srcdir = @srcdir@ | ||
4244 | 711 | sysconfdir = @sysconfdir@ | ||
4245 | 712 | target_alias = @target_alias@ | ||
4246 | 713 | top_builddir = @top_builddir@ | ||
4247 | 714 | top_srcdir = @top_srcdir@ | ||
4248 | 715 | |||
4249 | 716 | # Nonstandard package files for distribution | ||
4250 | 717 | |||
4251 | 718 | # MSVC project files | ||
4252 | 719 | |||
4253 | 720 | # xcode project files | ||
4254 | 721 | |||
4255 | 722 | # xcode sample files | ||
4256 | 723 | |||
4257 | 724 | # C++Builder project files | ||
4258 | 725 | EXTRA_DIST = CHANGES CONTRIBUTORS \ | ||
4259 | 726 | include/gtest/gtest-param-test.h.pump \ | ||
4260 | 727 | include/gtest/internal/gtest-tuple.h.pump \ | ||
4261 | 728 | include/gtest/internal/gtest-type-util.h.pump \ | ||
4262 | 729 | include/gtest/internal/gtest-param-util-generated.h.pump \ | ||
4263 | 730 | make/Makefile scons/SConscript scripts/fuse_gtest_files.py \ | ||
4264 | 731 | scripts/gen_gtest_pred_impl.py scripts/test/Makefile \ | ||
4265 | 732 | test/gtest_all_test.cc msvc/gtest.sln msvc/gtest.vcproj \ | ||
4266 | 733 | msvc/gtest_color_test_.vcproj msvc/gtest_env_var_test_.vcproj \ | ||
4267 | 734 | msvc/gtest_environment_test.vcproj msvc/gtest_main.vcproj \ | ||
4268 | 735 | msvc/gtest_output_test_.vcproj msvc/gtest_prod_test.vcproj \ | ||
4269 | 736 | msvc/gtest_uninitialized_test_.vcproj \ | ||
4270 | 737 | msvc/gtest_unittest.vcproj xcode/Config/DebugProject.xcconfig \ | ||
4271 | 738 | xcode/Config/FrameworkTarget.xcconfig \ | ||
4272 | 739 | xcode/Config/General.xcconfig \ | ||
4273 | 740 | xcode/Config/ReleaseProject.xcconfig \ | ||
4274 | 741 | xcode/Config/TestTarget.xcconfig \ | ||
4275 | 742 | xcode/Config/InternalTestTarget.xcconfig \ | ||
4276 | 743 | xcode/Config/InternalPythonTestTarget.xcconfig \ | ||
4277 | 744 | xcode/Resources/Info.plist xcode/Scripts/versiongenerate.py \ | ||
4278 | 745 | xcode/Scripts/runtests.sh \ | ||
4279 | 746 | xcode/gtest.xcodeproj/project.pbxproj \ | ||
4280 | 747 | xcode/Samples/FrameworkSample/Info.plist \ | ||
4281 | 748 | xcode/Samples/FrameworkSample/widget_test.cc \ | ||
4282 | 749 | xcode/Samples/FrameworkSample/widget.cc \ | ||
4283 | 750 | xcode/Samples/FrameworkSample/widget.h \ | ||
4284 | 751 | xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj \ | ||
4285 | 752 | codegear/gtest_all.cc codegear/gtest_link.cc \ | ||
4286 | 753 | codegear/gtest.cbproj codegear/gtest_main.cbproj \ | ||
4287 | 754 | codegear/gtest_unittest.cbproj codegear/gtest.groupproj \ | ||
4288 | 755 | $(m4data_DATA) $(am__append_3) | ||
4289 | 756 | |||
4290 | 757 | # TODO(wan@google.com): integrate scripts/gen_gtest_pred_impl.py into | ||
4291 | 758 | # the build system such that a user can specify the maximum predicate | ||
4292 | 759 | # arity here and have the script automatically generate the | ||
4293 | 760 | # corresponding .h and .cc files. | ||
4294 | 761 | |||
4295 | 762 | # Scripts and utilities | ||
4296 | 763 | bin_SCRIPTS = scripts/gtest-config | ||
4297 | 764 | CLEANFILES = $(bin_SCRIPTS) | ||
4298 | 765 | |||
4299 | 766 | # Distribute and install M4 macro | ||
4300 | 767 | m4datadir = $(datadir)/aclocal | ||
4301 | 768 | m4data_DATA = m4/gtest.m4 | ||
4302 | 769 | |||
4303 | 770 | # We define the global AM_CPPFLAGS as everything we compile includes from these | ||
4304 | 771 | # directories. | ||
4305 | 772 | AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include | ||
4306 | 773 | |||
4307 | 774 | # Build rules for libraries. | ||
4308 | 775 | lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la | ||
4309 | 776 | lib_libgtest_la_SOURCES = src/gtest.cc \ | ||
4310 | 777 | src/gtest-death-test.cc \ | ||
4311 | 778 | src/gtest-filepath.cc \ | ||
4312 | 779 | src/gtest-internal-inl.h \ | ||
4313 | 780 | src/gtest-port.cc \ | ||
4314 | 781 | src/gtest-test-part.cc \ | ||
4315 | 782 | src/gtest-typed-test.cc | ||
4316 | 783 | |||
4317 | 784 | pkginclude_HEADERS = include/gtest/gtest.h \ | ||
4318 | 785 | include/gtest/gtest-death-test.h \ | ||
4319 | 786 | include/gtest/gtest-message.h \ | ||
4320 | 787 | include/gtest/gtest-param-test.h \ | ||
4321 | 788 | include/gtest/gtest_pred_impl.h \ | ||
4322 | 789 | include/gtest/gtest_prod.h \ | ||
4323 | 790 | include/gtest/gtest-spi.h \ | ||
4324 | 791 | include/gtest/gtest-test-part.h \ | ||
4325 | 792 | include/gtest/gtest-typed-test.h | ||
4326 | 793 | |||
4327 | 794 | pkginclude_internaldir = $(pkgincludedir)/internal | ||
4328 | 795 | pkginclude_internal_HEADERS = \ | ||
4329 | 796 | include/gtest/internal/gtest-death-test-internal.h \ | ||
4330 | 797 | include/gtest/internal/gtest-filepath.h \ | ||
4331 | 798 | include/gtest/internal/gtest-internal.h \ | ||
4332 | 799 | include/gtest/internal/gtest-linked_ptr.h \ | ||
4333 | 800 | include/gtest/internal/gtest-param-util-generated.h \ | ||
4334 | 801 | include/gtest/internal/gtest-param-util.h \ | ||
4335 | 802 | include/gtest/internal/gtest-port.h \ | ||
4336 | 803 | include/gtest/internal/gtest-string.h \ | ||
4337 | 804 | include/gtest/internal/gtest-tuple.h \ | ||
4338 | 805 | include/gtest/internal/gtest-type-util.h | ||
4339 | 806 | |||
4340 | 807 | lib_libgtest_main_la_SOURCES = src/gtest_main.cc | ||
4341 | 808 | lib_libgtest_main_la_LIBADD = lib/libgtest.la | ||
4342 | 809 | |||
4343 | 810 | # Bulid rules for samples and tests. Automake's naming for some of | ||
4344 | 811 | # these variables isn't terribly obvious, so this is a brief | ||
4345 | 812 | # reference: | ||
4346 | 813 | # | ||
4347 | 814 | # TESTS -- Programs run automatically by "make check" | ||
4348 | 815 | # check_PROGRAMS -- Programs built by "make check" but not necessarily run | ||
4349 | 816 | noinst_LTLIBRARIES = samples/libsamples.la | ||
4350 | 817 | samples_libsamples_la_SOURCES = samples/sample1.cc \ | ||
4351 | 818 | samples/sample1.h \ | ||
4352 | 819 | samples/sample2.cc \ | ||
4353 | 820 | samples/sample2.h \ | ||
4354 | 821 | samples/sample3-inl.h \ | ||
4355 | 822 | samples/sample4.cc \ | ||
4356 | 823 | samples/sample4.h | ||
4357 | 824 | |||
4358 | 825 | TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \ | ||
4359 | 826 | GTEST_BUILD_DIR="$(top_builddir)/test" | ||
4360 | 827 | |||
4361 | 828 | samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc | ||
4362 | 829 | samples_sample1_unittest_LDADD = lib/libgtest_main.la \ | ||
4363 | 830 | samples/libsamples.la | ||
4364 | 831 | |||
4365 | 832 | samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc | ||
4366 | 833 | samples_sample2_unittest_LDADD = lib/libgtest_main.la \ | ||
4367 | 834 | samples/libsamples.la | ||
4368 | 835 | |||
4369 | 836 | samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc | ||
4370 | 837 | samples_sample3_unittest_LDADD = lib/libgtest_main.la \ | ||
4371 | 838 | samples/libsamples.la | ||
4372 | 839 | |||
4373 | 840 | samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc | ||
4374 | 841 | samples_sample4_unittest_LDADD = lib/libgtest_main.la \ | ||
4375 | 842 | samples/libsamples.la | ||
4376 | 843 | |||
4377 | 844 | samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc | ||
4378 | 845 | samples_sample5_unittest_LDADD = lib/libgtest_main.la \ | ||
4379 | 846 | samples/libsamples.la | ||
4380 | 847 | |||
4381 | 848 | samples_sample6_unittest_SOURCES = samples/prime_tables.h \ | ||
4382 | 849 | samples/sample6_unittest.cc | ||
4383 | 850 | |||
4384 | 851 | samples_sample6_unittest_LDADD = lib/libgtest_main.la \ | ||
4385 | 852 | samples/libsamples.la | ||
4386 | 853 | |||
4387 | 854 | samples_sample7_unittest_SOURCES = samples/prime_tables.h \ | ||
4388 | 855 | samples/sample7_unittest.cc | ||
4389 | 856 | |||
4390 | 857 | samples_sample7_unittest_LDADD = lib/libgtest_main.la \ | ||
4391 | 858 | samples/libsamples.la | ||
4392 | 859 | |||
4393 | 860 | samples_sample8_unittest_SOURCES = samples/prime_tables.h \ | ||
4394 | 861 | samples/sample8_unittest.cc | ||
4395 | 862 | |||
4396 | 863 | samples_sample8_unittest_LDADD = lib/libgtest_main.la \ | ||
4397 | 864 | samples/libsamples.la | ||
4398 | 865 | |||
4399 | 866 | test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc | ||
4400 | 867 | test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS) | ||
4401 | 868 | test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \ | ||
4402 | 869 | lib/libgtest_main.la | ||
4403 | 870 | |||
4404 | 871 | test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc | ||
4405 | 872 | test_gtest_environment_test_LDADD = lib/libgtest.la | ||
4406 | 873 | test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc | ||
4407 | 874 | test_gtest_filepath_test_LDADD = lib/libgtest_main.la | ||
4408 | 875 | test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc | ||
4409 | 876 | test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la | ||
4410 | 877 | test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc | ||
4411 | 878 | test_gtest_main_unittest_LDADD = lib/libgtest_main.la | ||
4412 | 879 | test_gtest_message_test_SOURCES = test/gtest-message_test.cc | ||
4413 | 880 | test_gtest_message_test_LDADD = lib/libgtest_main.la | ||
4414 | 881 | test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc | ||
4415 | 882 | test_gtest_no_test_unittest_LDADD = lib/libgtest.la | ||
4416 | 883 | test_gtest_options_test_SOURCES = test/gtest-options_test.cc | ||
4417 | 884 | test_gtest_options_test_LDADD = lib/libgtest_main.la | ||
4418 | 885 | test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \ | ||
4419 | 886 | test/gtest-param-test2_test.cc \ | ||
4420 | 887 | test/gtest-param-test_test.h | ||
4421 | 888 | |||
4422 | 889 | test_gtest_param_test_test_LDADD = lib/libgtest.la | ||
4423 | 890 | test_gtest_port_test_SOURCES = test/gtest-port_test.cc | ||
4424 | 891 | test_gtest_port_test_LDADD = lib/libgtest_main.la | ||
4425 | 892 | test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc | ||
4426 | 893 | test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la | ||
4427 | 894 | test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \ | ||
4428 | 895 | test/production.cc \ | ||
4429 | 896 | test/production.h | ||
4430 | 897 | |||
4431 | 898 | test_gtest_prod_test_LDADD = lib/libgtest_main.la | ||
4432 | 899 | test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc | ||
4433 | 900 | test_gtest_repeat_test_LDADD = lib/libgtest.la | ||
4434 | 901 | test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc | ||
4435 | 902 | test_gtest_sole_header_test_LDADD = lib/libgtest_main.la | ||
4436 | 903 | test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc | ||
4437 | 904 | test_gtest_stress_test_LDADD = lib/libgtest.la | ||
4438 | 905 | test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc | ||
4439 | 906 | test_gtest_test_part_test_LDADD = lib/libgtest_main.la | ||
4440 | 907 | test_gtest_throw_on_failure_ex_test_SOURCES = \ | ||
4441 | 908 | test/gtest_throw_on_failure_ex_test.cc \ | ||
4442 | 909 | src/gtest-all.cc | ||
4443 | 910 | |||
4444 | 911 | test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions | ||
4445 | 912 | test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \ | ||
4446 | 913 | test/gtest-typed-test2_test.cc \ | ||
4447 | 914 | test/gtest-typed-test_test.h | ||
4448 | 915 | |||
4449 | 916 | test_gtest_typed_test_test_LDADD = lib/libgtest_main.la | ||
4450 | 917 | test_gtest_unittest_SOURCES = test/gtest_unittest.cc | ||
4451 | 918 | test_gtest_unittest_LDADD = lib/libgtest_main.la | ||
4452 | 919 | test_gtest_unittest_api_test_SOURCES = test/gtest-unittest-api_test.cc | ||
4453 | 920 | test_gtest_unittest_api_test_LDADD = lib/libgtest_main.la | ||
4454 | 921 | test_gtest_no_rtti_test_SOURCES = test/gtest_unittest.cc \ | ||
4455 | 922 | src/gtest-all.cc \ | ||
4456 | 923 | src/gtest_main.cc | ||
4457 | 924 | |||
4458 | 925 | test_gtest_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0 | ||
4459 | 926 | test_gtest_tuple_test_SOURCES = test/gtest-tuple_test.cc \ | ||
4460 | 927 | src/gtest-all.cc \ | ||
4461 | 928 | src/gtest_main.cc | ||
4462 | 929 | |||
4463 | 930 | test_gtest_tuple_test_CXXFLAGS = $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1 | ||
4464 | 931 | test_gtest_use_own_tuple_test_SOURCES = test/gtest-param-test_test.cc \ | ||
4465 | 932 | test/gtest-param-test2_test.cc \ | ||
4466 | 933 | src/gtest-all.cc | ||
4467 | 934 | |||
4468 | 935 | test_gtest_use_own_tuple_test_CXXFLAGS = \ | ||
4469 | 936 | $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1 | ||
4470 | 937 | |||
4471 | 938 | |||
4472 | 939 | # The following tests depend on the presence of a Python installation and are | ||
4473 | 940 | # keyed off of it. TODO(chandlerc@google.com): While we currently only attempt | ||
4474 | 941 | # to build and execute these tests if Autoconf has found Python v2.4 on the | ||
4475 | 942 | # system, we don't use the PYTHON variable it specified as the valid | ||
4476 | 943 | # interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and | ||
4477 | 944 | # thus we cannot distinguish between C++ unit tests and Python unit tests. | ||
4478 | 945 | |||
4479 | 946 | # These two Python modules are used by multiple Python tests below. | ||
4480 | 947 | @HAVE_PYTHON_TRUE@check_SCRIPTS = test/gtest_test_utils.py \ | ||
4481 | 948 | @HAVE_PYTHON_TRUE@ test/gtest_xml_test_utils.py \ | ||
4482 | 949 | @HAVE_PYTHON_TRUE@ test/gtest_break_on_failure_unittest.py \ | ||
4483 | 950 | @HAVE_PYTHON_TRUE@ test/gtest_color_test.py \ | ||
4484 | 951 | @HAVE_PYTHON_TRUE@ test/gtest_env_var_test.py \ | ||
4485 | 952 | @HAVE_PYTHON_TRUE@ test/gtest_filter_unittest.py \ | ||
4486 | 953 | @HAVE_PYTHON_TRUE@ test/gtest_help_test.py \ | ||
4487 | 954 | @HAVE_PYTHON_TRUE@ test/gtest_list_tests_unittest.py \ | ||
4488 | 955 | @HAVE_PYTHON_TRUE@ test/gtest_output_test.py \ | ||
4489 | 956 | @HAVE_PYTHON_TRUE@ test/gtest_throw_on_failure_test.py \ | ||
4490 | 957 | @HAVE_PYTHON_TRUE@ test/gtest_uninitialized_test.py \ | ||
4491 | 958 | @HAVE_PYTHON_TRUE@ test/gtest_xml_outfiles_test.py \ | ||
4492 | 959 | @HAVE_PYTHON_TRUE@ test/gtest_xml_output_unittest.py | ||
4493 | 960 | @HAVE_PYTHON_TRUE@test_gtest_break_on_failure_unittest__SOURCES = \ | ||
4494 | 961 | @HAVE_PYTHON_TRUE@ test/gtest_break_on_failure_unittest_.cc | ||
4495 | 962 | |||
4496 | 963 | @HAVE_PYTHON_TRUE@test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la | ||
4497 | 964 | @HAVE_PYTHON_TRUE@test_gtest_color_test__SOURCES = test/gtest_color_test_.cc | ||
4498 | 965 | @HAVE_PYTHON_TRUE@test_gtest_color_test__LDADD = lib/libgtest.la | ||
4499 | 966 | @HAVE_PYTHON_TRUE@test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc | ||
4500 | 967 | @HAVE_PYTHON_TRUE@test_gtest_env_var_test__LDADD = lib/libgtest.la | ||
4501 | 968 | @HAVE_PYTHON_TRUE@test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc | ||
4502 | 969 | @HAVE_PYTHON_TRUE@test_gtest_filter_unittest__LDADD = lib/libgtest.la | ||
4503 | 970 | @HAVE_PYTHON_TRUE@test_gtest_help_test__SOURCES = test/gtest_help_test_.cc | ||
4504 | 971 | @HAVE_PYTHON_TRUE@test_gtest_help_test__LDADD = lib/libgtest_main.la | ||
4505 | 972 | @HAVE_PYTHON_TRUE@test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc | ||
4506 | 973 | @HAVE_PYTHON_TRUE@test_gtest_list_tests_unittest__LDADD = lib/libgtest.la | ||
4507 | 974 | @HAVE_PYTHON_TRUE@test_gtest_output_test__SOURCES = test/gtest_output_test_.cc | ||
4508 | 975 | @HAVE_PYTHON_TRUE@test_gtest_output_test__LDADD = lib/libgtest.la | ||
4509 | 976 | @HAVE_PYTHON_TRUE@test_gtest_throw_on_failure_test__SOURCES = \ | ||
4510 | 977 | @HAVE_PYTHON_TRUE@ test/gtest_throw_on_failure_test_.cc \ | ||
4511 | 978 | @HAVE_PYTHON_TRUE@ src/gtest-all.cc | ||
4512 | 979 | |||
4513 | 980 | @HAVE_PYTHON_TRUE@test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions | ||
4514 | 981 | @HAVE_PYTHON_TRUE@test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc | ||
4515 | 982 | @HAVE_PYTHON_TRUE@test_gtest_uninitialized_test__LDADD = lib/libgtest.la | ||
4516 | 983 | @HAVE_PYTHON_TRUE@test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc | ||
4517 | 984 | @HAVE_PYTHON_TRUE@test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la | ||
4518 | 985 | @HAVE_PYTHON_TRUE@test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc | ||
4519 | 986 | @HAVE_PYTHON_TRUE@test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la | ||
4520 | 987 | @HAVE_PYTHON_TRUE@test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc | ||
4521 | 988 | @HAVE_PYTHON_TRUE@test_gtest_xml_output_unittest__LDADD = lib/libgtest_main.la | ||
4522 | 989 | all: all-am | ||
4523 | 990 | |||
4524 | 991 | .SUFFIXES: | ||
4525 | 992 | .SUFFIXES: .cc .lo .o .obj | ||
4526 | 993 | am--refresh: | ||
4527 | 994 | @: | ||
4528 | 995 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | ||
4529 | 996 | @for dep in $?; do \ | ||
4530 | 997 | case '$(am__configure_deps)' in \ | ||
4531 | 998 | *$$dep*) \ | ||
4532 | 999 | echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ | ||
4533 | 1000 | cd $(srcdir) && $(AUTOMAKE) --foreign \ | ||
4534 | 1001 | && exit 0; \ | ||
4535 | 1002 | exit 1;; \ | ||
4536 | 1003 | esac; \ | ||
4537 | 1004 | done; \ | ||
4538 | 1005 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ | ||
4539 | 1006 | cd $(top_srcdir) && \ | ||
4540 | 1007 | $(AUTOMAKE) --foreign Makefile | ||
4541 | 1008 | .PRECIOUS: Makefile | ||
4542 | 1009 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
4543 | 1010 | @case '$?' in \ | ||
4544 | 1011 | *config.status*) \ | ||
4545 | 1012 | echo ' $(SHELL) ./config.status'; \ | ||
4546 | 1013 | $(SHELL) ./config.status;; \ | ||
4547 | 1014 | *) \ | ||
4548 | 1015 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | ||
4549 | 1016 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | ||
4550 | 1017 | esac; | ||
4551 | 1018 | |||
4552 | 1019 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
4553 | 1020 | $(SHELL) ./config.status --recheck | ||
4554 | 1021 | |||
4555 | 1022 | $(top_srcdir)/configure: $(am__configure_deps) | ||
4556 | 1023 | cd $(srcdir) && $(AUTOCONF) | ||
4557 | 1024 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) | ||
4558 | 1025 | cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | ||
4559 | 1026 | |||
4560 | 1027 | build-aux/config.h: build-aux/stamp-h1 | ||
4561 | 1028 | @if test ! -f $@; then \ | ||
4562 | 1029 | rm -f build-aux/stamp-h1; \ | ||
4563 | 1030 | $(MAKE) $(AM_MAKEFLAGS) build-aux/stamp-h1; \ | ||
4564 | 1031 | else :; fi | ||
4565 | 1032 | |||
4566 | 1033 | build-aux/stamp-h1: $(top_srcdir)/build-aux/config.h.in $(top_builddir)/config.status | ||
4567 | 1034 | @rm -f build-aux/stamp-h1 | ||
4568 | 1035 | cd $(top_builddir) && $(SHELL) ./config.status build-aux/config.h | ||
4569 | 1036 | $(top_srcdir)/build-aux/config.h.in: $(am__configure_deps) | ||
4570 | 1037 | cd $(top_srcdir) && $(AUTOHEADER) | ||
4571 | 1038 | rm -f build-aux/stamp-h1 | ||
4572 | 1039 | touch $@ | ||
4573 | 1040 | |||
4574 | 1041 | distclean-hdr: | ||
4575 | 1042 | -rm -f build-aux/config.h build-aux/stamp-h1 | ||
4576 | 1043 | scripts/gtest-config: $(top_builddir)/config.status $(top_srcdir)/scripts/gtest-config.in | ||
4577 | 1044 | cd $(top_builddir) && $(SHELL) ./config.status $@ | ||
4578 | 1045 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) | ||
4579 | 1046 | @$(NORMAL_INSTALL) | ||
4580 | 1047 | test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" | ||
4581 | 1048 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | ||
4582 | 1049 | if test -f $$p; then \ | ||
4583 | 1050 | f=$(am__strip_dir) \ | ||
4584 | 1051 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ | ||
4585 | 1052 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ | ||
4586 | 1053 | else :; fi; \ | ||
4587 | 1054 | done | ||
4588 | 1055 | |||
4589 | 1056 | uninstall-libLTLIBRARIES: | ||
4590 | 1057 | @$(NORMAL_UNINSTALL) | ||
4591 | 1058 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | ||
4592 | 1059 | p=$(am__strip_dir) \ | ||
4593 | 1060 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ | ||
4594 | 1061 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ | ||
4595 | 1062 | done | ||
4596 | 1063 | |||
4597 | 1064 | clean-libLTLIBRARIES: | ||
4598 | 1065 | -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) | ||
4599 | 1066 | @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | ||
4600 | 1067 | dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ | ||
4601 | 1068 | test "$$dir" != "$$p" || dir=.; \ | ||
4602 | 1069 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
4603 | 1070 | rm -f "$${dir}/so_locations"; \ | ||
4604 | 1071 | done | ||
4605 | 1072 | |||
4606 | 1073 | clean-noinstLTLIBRARIES: | ||
4607 | 1074 | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | ||
4608 | 1075 | @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ | ||
4609 | 1076 | dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ | ||
4610 | 1077 | test "$$dir" != "$$p" || dir=.; \ | ||
4611 | 1078 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
4612 | 1079 | rm -f "$${dir}/so_locations"; \ | ||
4613 | 1080 | done | ||
4614 | 1081 | src/$(am__dirstamp): | ||
4615 | 1082 | @$(MKDIR_P) src | ||
4616 | 1083 | @: > src/$(am__dirstamp) | ||
4617 | 1084 | src/$(DEPDIR)/$(am__dirstamp): | ||
4618 | 1085 | @$(MKDIR_P) src/$(DEPDIR) | ||
4619 | 1086 | @: > src/$(DEPDIR)/$(am__dirstamp) | ||
4620 | 1087 | src/gtest.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) | ||
4621 | 1088 | src/gtest-death-test.lo: src/$(am__dirstamp) \ | ||
4622 | 1089 | src/$(DEPDIR)/$(am__dirstamp) | ||
4623 | 1090 | src/gtest-filepath.lo: src/$(am__dirstamp) \ | ||
4624 | 1091 | src/$(DEPDIR)/$(am__dirstamp) | ||
4625 | 1092 | src/gtest-port.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) | ||
4626 | 1093 | src/gtest-test-part.lo: src/$(am__dirstamp) \ | ||
4627 | 1094 | src/$(DEPDIR)/$(am__dirstamp) | ||
4628 | 1095 | src/gtest-typed-test.lo: src/$(am__dirstamp) \ | ||
4629 | 1096 | src/$(DEPDIR)/$(am__dirstamp) | ||
4630 | 1097 | lib/$(am__dirstamp): | ||
4631 | 1098 | @$(MKDIR_P) lib | ||
4632 | 1099 | @: > lib/$(am__dirstamp) | ||
4633 | 1100 | lib/libgtest.la: $(lib_libgtest_la_OBJECTS) $(lib_libgtest_la_DEPENDENCIES) lib/$(am__dirstamp) | ||
4634 | 1101 | $(CXXLINK) -rpath $(libdir) $(lib_libgtest_la_OBJECTS) $(lib_libgtest_la_LIBADD) $(LIBS) | ||
4635 | 1102 | src/gtest_main.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) | ||
4636 | 1103 | lib/libgtest_main.la: $(lib_libgtest_main_la_OBJECTS) $(lib_libgtest_main_la_DEPENDENCIES) lib/$(am__dirstamp) | ||
4637 | 1104 | $(CXXLINK) -rpath $(libdir) $(lib_libgtest_main_la_OBJECTS) $(lib_libgtest_main_la_LIBADD) $(LIBS) | ||
4638 | 1105 | samples/$(am__dirstamp): | ||
4639 | 1106 | @$(MKDIR_P) samples | ||
4640 | 1107 | @: > samples/$(am__dirstamp) | ||
4641 | 1108 | samples/$(DEPDIR)/$(am__dirstamp): | ||
4642 | 1109 | @$(MKDIR_P) samples/$(DEPDIR) | ||
4643 | 1110 | @: > samples/$(DEPDIR)/$(am__dirstamp) | ||
4644 | 1111 | samples/sample1.lo: samples/$(am__dirstamp) \ | ||
4645 | 1112 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4646 | 1113 | samples/sample2.lo: samples/$(am__dirstamp) \ | ||
4647 | 1114 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4648 | 1115 | samples/sample4.lo: samples/$(am__dirstamp) \ | ||
4649 | 1116 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4650 | 1117 | samples/libsamples.la: $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_DEPENDENCIES) samples/$(am__dirstamp) | ||
4651 | 1118 | $(CXXLINK) $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_LIBADD) $(LIBS) | ||
4652 | 1119 | |||
4653 | 1120 | clean-checkPROGRAMS: | ||
4654 | 1121 | @list='$(check_PROGRAMS)'; for p in $$list; do \ | ||
4655 | 1122 | f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ | ||
4656 | 1123 | echo " rm -f $$p $$f"; \ | ||
4657 | 1124 | rm -f $$p $$f ; \ | ||
4658 | 1125 | done | ||
4659 | 1126 | samples/sample1_unittest.$(OBJEXT): samples/$(am__dirstamp) \ | ||
4660 | 1127 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4661 | 1128 | samples/sample1_unittest$(EXEEXT): $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_DEPENDENCIES) samples/$(am__dirstamp) | ||
4662 | 1129 | @rm -f samples/sample1_unittest$(EXEEXT) | ||
4663 | 1130 | $(CXXLINK) $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_LDADD) $(LIBS) | ||
4664 | 1131 | samples/sample2_unittest.$(OBJEXT): samples/$(am__dirstamp) \ | ||
4665 | 1132 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4666 | 1133 | samples/sample2_unittest$(EXEEXT): $(samples_sample2_unittest_OBJECTS) $(samples_sample2_unittest_DEPENDENCIES) samples/$(am__dirstamp) | ||
4667 | 1134 | @rm -f samples/sample2_unittest$(EXEEXT) | ||
4668 | 1135 | $(CXXLINK) $(samples_sample2_unittest_OBJECTS) $(samples_sample2_unittest_LDADD) $(LIBS) | ||
4669 | 1136 | samples/sample3_unittest.$(OBJEXT): samples/$(am__dirstamp) \ | ||
4670 | 1137 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4671 | 1138 | samples/sample3_unittest$(EXEEXT): $(samples_sample3_unittest_OBJECTS) $(samples_sample3_unittest_DEPENDENCIES) samples/$(am__dirstamp) | ||
4672 | 1139 | @rm -f samples/sample3_unittest$(EXEEXT) | ||
4673 | 1140 | $(CXXLINK) $(samples_sample3_unittest_OBJECTS) $(samples_sample3_unittest_LDADD) $(LIBS) | ||
4674 | 1141 | samples/sample4_unittest.$(OBJEXT): samples/$(am__dirstamp) \ | ||
4675 | 1142 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4676 | 1143 | samples/sample4_unittest$(EXEEXT): $(samples_sample4_unittest_OBJECTS) $(samples_sample4_unittest_DEPENDENCIES) samples/$(am__dirstamp) | ||
4677 | 1144 | @rm -f samples/sample4_unittest$(EXEEXT) | ||
4678 | 1145 | $(CXXLINK) $(samples_sample4_unittest_OBJECTS) $(samples_sample4_unittest_LDADD) $(LIBS) | ||
4679 | 1146 | samples/sample5_unittest.$(OBJEXT): samples/$(am__dirstamp) \ | ||
4680 | 1147 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4681 | 1148 | samples/sample5_unittest$(EXEEXT): $(samples_sample5_unittest_OBJECTS) $(samples_sample5_unittest_DEPENDENCIES) samples/$(am__dirstamp) | ||
4682 | 1149 | @rm -f samples/sample5_unittest$(EXEEXT) | ||
4683 | 1150 | $(CXXLINK) $(samples_sample5_unittest_OBJECTS) $(samples_sample5_unittest_LDADD) $(LIBS) | ||
4684 | 1151 | samples/sample6_unittest.$(OBJEXT): samples/$(am__dirstamp) \ | ||
4685 | 1152 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4686 | 1153 | samples/sample6_unittest$(EXEEXT): $(samples_sample6_unittest_OBJECTS) $(samples_sample6_unittest_DEPENDENCIES) samples/$(am__dirstamp) | ||
4687 | 1154 | @rm -f samples/sample6_unittest$(EXEEXT) | ||
4688 | 1155 | $(CXXLINK) $(samples_sample6_unittest_OBJECTS) $(samples_sample6_unittest_LDADD) $(LIBS) | ||
4689 | 1156 | samples/sample7_unittest.$(OBJEXT): samples/$(am__dirstamp) \ | ||
4690 | 1157 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4691 | 1158 | samples/sample7_unittest$(EXEEXT): $(samples_sample7_unittest_OBJECTS) $(samples_sample7_unittest_DEPENDENCIES) samples/$(am__dirstamp) | ||
4692 | 1159 | @rm -f samples/sample7_unittest$(EXEEXT) | ||
4693 | 1160 | $(CXXLINK) $(samples_sample7_unittest_OBJECTS) $(samples_sample7_unittest_LDADD) $(LIBS) | ||
4694 | 1161 | samples/sample8_unittest.$(OBJEXT): samples/$(am__dirstamp) \ | ||
4695 | 1162 | samples/$(DEPDIR)/$(am__dirstamp) | ||
4696 | 1163 | samples/sample8_unittest$(EXEEXT): $(samples_sample8_unittest_OBJECTS) $(samples_sample8_unittest_DEPENDENCIES) samples/$(am__dirstamp) | ||
4697 | 1164 | @rm -f samples/sample8_unittest$(EXEEXT) | ||
4698 | 1165 | $(CXXLINK) $(samples_sample8_unittest_OBJECTS) $(samples_sample8_unittest_LDADD) $(LIBS) | ||
4699 | 1166 | test/$(am__dirstamp): | ||
4700 | 1167 | @$(MKDIR_P) test | ||
4701 | 1168 | @: > test/$(am__dirstamp) | ||
4702 | 1169 | test/$(DEPDIR)/$(am__dirstamp): | ||
4703 | 1170 | @$(MKDIR_P) test/$(DEPDIR) | ||
4704 | 1171 | @: > test/$(DEPDIR)/$(am__dirstamp) | ||
4705 | 1172 | test/test_gtest_death_test_test-gtest-death-test_test.$(OBJEXT): \ | ||
4706 | 1173 | test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) | ||
4707 | 1174 | test/gtest-death-test_test$(EXEEXT): $(test_gtest_death_test_test_OBJECTS) $(test_gtest_death_test_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4708 | 1175 | @rm -f test/gtest-death-test_test$(EXEEXT) | ||
4709 | 1176 | $(test_gtest_death_test_test_LINK) $(test_gtest_death_test_test_OBJECTS) $(test_gtest_death_test_test_LDADD) $(LIBS) | ||
4710 | 1177 | test/gtest-filepath_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4711 | 1178 | test/$(DEPDIR)/$(am__dirstamp) | ||
4712 | 1179 | test/gtest-filepath_test$(EXEEXT): $(test_gtest_filepath_test_OBJECTS) $(test_gtest_filepath_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4713 | 1180 | @rm -f test/gtest-filepath_test$(EXEEXT) | ||
4714 | 1181 | $(CXXLINK) $(test_gtest_filepath_test_OBJECTS) $(test_gtest_filepath_test_LDADD) $(LIBS) | ||
4715 | 1182 | test/gtest-linked_ptr_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4716 | 1183 | test/$(DEPDIR)/$(am__dirstamp) | ||
4717 | 1184 | test/gtest-linked_ptr_test$(EXEEXT): $(test_gtest_linked_ptr_test_OBJECTS) $(test_gtest_linked_ptr_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4718 | 1185 | @rm -f test/gtest-linked_ptr_test$(EXEEXT) | ||
4719 | 1186 | $(CXXLINK) $(test_gtest_linked_ptr_test_OBJECTS) $(test_gtest_linked_ptr_test_LDADD) $(LIBS) | ||
4720 | 1187 | test/gtest-message_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4721 | 1188 | test/$(DEPDIR)/$(am__dirstamp) | ||
4722 | 1189 | test/gtest-message_test$(EXEEXT): $(test_gtest_message_test_OBJECTS) $(test_gtest_message_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4723 | 1190 | @rm -f test/gtest-message_test$(EXEEXT) | ||
4724 | 1191 | $(CXXLINK) $(test_gtest_message_test_OBJECTS) $(test_gtest_message_test_LDADD) $(LIBS) | ||
4725 | 1192 | test/gtest-options_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4726 | 1193 | test/$(DEPDIR)/$(am__dirstamp) | ||
4727 | 1194 | test/gtest-options_test$(EXEEXT): $(test_gtest_options_test_OBJECTS) $(test_gtest_options_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4728 | 1195 | @rm -f test/gtest-options_test$(EXEEXT) | ||
4729 | 1196 | $(CXXLINK) $(test_gtest_options_test_OBJECTS) $(test_gtest_options_test_LDADD) $(LIBS) | ||
4730 | 1197 | test/gtest-param-test_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4731 | 1198 | test/$(DEPDIR)/$(am__dirstamp) | ||
4732 | 1199 | test/gtest-param-test2_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4733 | 1200 | test/$(DEPDIR)/$(am__dirstamp) | ||
4734 | 1201 | test/gtest-param-test_test$(EXEEXT): $(test_gtest_param_test_test_OBJECTS) $(test_gtest_param_test_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4735 | 1202 | @rm -f test/gtest-param-test_test$(EXEEXT) | ||
4736 | 1203 | $(CXXLINK) $(test_gtest_param_test_test_OBJECTS) $(test_gtest_param_test_test_LDADD) $(LIBS) | ||
4737 | 1204 | test/gtest-port_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4738 | 1205 | test/$(DEPDIR)/$(am__dirstamp) | ||
4739 | 1206 | test/gtest-port_test$(EXEEXT): $(test_gtest_port_test_OBJECTS) $(test_gtest_port_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4740 | 1207 | @rm -f test/gtest-port_test$(EXEEXT) | ||
4741 | 1208 | $(CXXLINK) $(test_gtest_port_test_OBJECTS) $(test_gtest_port_test_LDADD) $(LIBS) | ||
4742 | 1209 | test/gtest-test-part_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4743 | 1210 | test/$(DEPDIR)/$(am__dirstamp) | ||
4744 | 1211 | test/gtest-test-part_test$(EXEEXT): $(test_gtest_test_part_test_OBJECTS) $(test_gtest_test_part_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4745 | 1212 | @rm -f test/gtest-test-part_test$(EXEEXT) | ||
4746 | 1213 | $(CXXLINK) $(test_gtest_test_part_test_OBJECTS) $(test_gtest_test_part_test_LDADD) $(LIBS) | ||
4747 | 1214 | test/test_gtest_tuple_test-gtest-tuple_test.$(OBJEXT): \ | ||
4748 | 1215 | test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) | ||
4749 | 1216 | src/test_gtest_tuple_test-gtest-all.$(OBJEXT): src/$(am__dirstamp) \ | ||
4750 | 1217 | src/$(DEPDIR)/$(am__dirstamp) | ||
4751 | 1218 | src/test_gtest_tuple_test-gtest_main.$(OBJEXT): src/$(am__dirstamp) \ | ||
4752 | 1219 | src/$(DEPDIR)/$(am__dirstamp) | ||
4753 | 1220 | test/gtest-tuple_test$(EXEEXT): $(test_gtest_tuple_test_OBJECTS) $(test_gtest_tuple_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4754 | 1221 | @rm -f test/gtest-tuple_test$(EXEEXT) | ||
4755 | 1222 | $(test_gtest_tuple_test_LINK) $(test_gtest_tuple_test_OBJECTS) $(test_gtest_tuple_test_LDADD) $(LIBS) | ||
4756 | 1223 | test/gtest-typed-test_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4757 | 1224 | test/$(DEPDIR)/$(am__dirstamp) | ||
4758 | 1225 | test/gtest-typed-test2_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4759 | 1226 | test/$(DEPDIR)/$(am__dirstamp) | ||
4760 | 1227 | test/gtest-typed-test_test$(EXEEXT): $(test_gtest_typed_test_test_OBJECTS) $(test_gtest_typed_test_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4761 | 1228 | @rm -f test/gtest-typed-test_test$(EXEEXT) | ||
4762 | 1229 | $(CXXLINK) $(test_gtest_typed_test_test_OBJECTS) $(test_gtest_typed_test_test_LDADD) $(LIBS) | ||
4763 | 1230 | test/gtest-unittest-api_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4764 | 1231 | test/$(DEPDIR)/$(am__dirstamp) | ||
4765 | 1232 | test/gtest-unittest-api_test$(EXEEXT): $(test_gtest_unittest_api_test_OBJECTS) $(test_gtest_unittest_api_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4766 | 1233 | @rm -f test/gtest-unittest-api_test$(EXEEXT) | ||
4767 | 1234 | $(CXXLINK) $(test_gtest_unittest_api_test_OBJECTS) $(test_gtest_unittest_api_test_LDADD) $(LIBS) | ||
4768 | 1235 | test/gtest_break_on_failure_unittest_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4769 | 1236 | test/$(DEPDIR)/$(am__dirstamp) | ||
4770 | 1237 | test/gtest_break_on_failure_unittest_$(EXEEXT): $(test_gtest_break_on_failure_unittest__OBJECTS) $(test_gtest_break_on_failure_unittest__DEPENDENCIES) test/$(am__dirstamp) | ||
4771 | 1238 | @rm -f test/gtest_break_on_failure_unittest_$(EXEEXT) | ||
4772 | 1239 | $(CXXLINK) $(test_gtest_break_on_failure_unittest__OBJECTS) $(test_gtest_break_on_failure_unittest__LDADD) $(LIBS) | ||
4773 | 1240 | test/gtest_color_test_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4774 | 1241 | test/$(DEPDIR)/$(am__dirstamp) | ||
4775 | 1242 | test/gtest_color_test_$(EXEEXT): $(test_gtest_color_test__OBJECTS) $(test_gtest_color_test__DEPENDENCIES) test/$(am__dirstamp) | ||
4776 | 1243 | @rm -f test/gtest_color_test_$(EXEEXT) | ||
4777 | 1244 | $(CXXLINK) $(test_gtest_color_test__OBJECTS) $(test_gtest_color_test__LDADD) $(LIBS) | ||
4778 | 1245 | test/gtest_env_var_test_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4779 | 1246 | test/$(DEPDIR)/$(am__dirstamp) | ||
4780 | 1247 | test/gtest_env_var_test_$(EXEEXT): $(test_gtest_env_var_test__OBJECTS) $(test_gtest_env_var_test__DEPENDENCIES) test/$(am__dirstamp) | ||
4781 | 1248 | @rm -f test/gtest_env_var_test_$(EXEEXT) | ||
4782 | 1249 | $(CXXLINK) $(test_gtest_env_var_test__OBJECTS) $(test_gtest_env_var_test__LDADD) $(LIBS) | ||
4783 | 1250 | test/gtest_environment_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4784 | 1251 | test/$(DEPDIR)/$(am__dirstamp) | ||
4785 | 1252 | test/gtest_environment_test$(EXEEXT): $(test_gtest_environment_test_OBJECTS) $(test_gtest_environment_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4786 | 1253 | @rm -f test/gtest_environment_test$(EXEEXT) | ||
4787 | 1254 | $(CXXLINK) $(test_gtest_environment_test_OBJECTS) $(test_gtest_environment_test_LDADD) $(LIBS) | ||
4788 | 1255 | test/gtest_filter_unittest_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4789 | 1256 | test/$(DEPDIR)/$(am__dirstamp) | ||
4790 | 1257 | test/gtest_filter_unittest_$(EXEEXT): $(test_gtest_filter_unittest__OBJECTS) $(test_gtest_filter_unittest__DEPENDENCIES) test/$(am__dirstamp) | ||
4791 | 1258 | @rm -f test/gtest_filter_unittest_$(EXEEXT) | ||
4792 | 1259 | $(CXXLINK) $(test_gtest_filter_unittest__OBJECTS) $(test_gtest_filter_unittest__LDADD) $(LIBS) | ||
4793 | 1260 | test/gtest_help_test_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4794 | 1261 | test/$(DEPDIR)/$(am__dirstamp) | ||
4795 | 1262 | test/gtest_help_test_$(EXEEXT): $(test_gtest_help_test__OBJECTS) $(test_gtest_help_test__DEPENDENCIES) test/$(am__dirstamp) | ||
4796 | 1263 | @rm -f test/gtest_help_test_$(EXEEXT) | ||
4797 | 1264 | $(CXXLINK) $(test_gtest_help_test__OBJECTS) $(test_gtest_help_test__LDADD) $(LIBS) | ||
4798 | 1265 | test/gtest_list_tests_unittest_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4799 | 1266 | test/$(DEPDIR)/$(am__dirstamp) | ||
4800 | 1267 | test/gtest_list_tests_unittest_$(EXEEXT): $(test_gtest_list_tests_unittest__OBJECTS) $(test_gtest_list_tests_unittest__DEPENDENCIES) test/$(am__dirstamp) | ||
4801 | 1268 | @rm -f test/gtest_list_tests_unittest_$(EXEEXT) | ||
4802 | 1269 | $(CXXLINK) $(test_gtest_list_tests_unittest__OBJECTS) $(test_gtest_list_tests_unittest__LDADD) $(LIBS) | ||
4803 | 1270 | test/gtest_main_unittest.$(OBJEXT): test/$(am__dirstamp) \ | ||
4804 | 1271 | test/$(DEPDIR)/$(am__dirstamp) | ||
4805 | 1272 | test/gtest_main_unittest$(EXEEXT): $(test_gtest_main_unittest_OBJECTS) $(test_gtest_main_unittest_DEPENDENCIES) test/$(am__dirstamp) | ||
4806 | 1273 | @rm -f test/gtest_main_unittest$(EXEEXT) | ||
4807 | 1274 | $(CXXLINK) $(test_gtest_main_unittest_OBJECTS) $(test_gtest_main_unittest_LDADD) $(LIBS) | ||
4808 | 1275 | test/test_gtest_no_rtti_test-gtest_unittest.$(OBJEXT): \ | ||
4809 | 1276 | test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) | ||
4810 | 1277 | src/test_gtest_no_rtti_test-gtest-all.$(OBJEXT): src/$(am__dirstamp) \ | ||
4811 | 1278 | src/$(DEPDIR)/$(am__dirstamp) | ||
4812 | 1279 | src/test_gtest_no_rtti_test-gtest_main.$(OBJEXT): src/$(am__dirstamp) \ | ||
4813 | 1280 | src/$(DEPDIR)/$(am__dirstamp) | ||
4814 | 1281 | test/gtest_no_rtti_test$(EXEEXT): $(test_gtest_no_rtti_test_OBJECTS) $(test_gtest_no_rtti_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4815 | 1282 | @rm -f test/gtest_no_rtti_test$(EXEEXT) | ||
4816 | 1283 | $(test_gtest_no_rtti_test_LINK) $(test_gtest_no_rtti_test_OBJECTS) $(test_gtest_no_rtti_test_LDADD) $(LIBS) | ||
4817 | 1284 | test/gtest_no_test_unittest.$(OBJEXT): test/$(am__dirstamp) \ | ||
4818 | 1285 | test/$(DEPDIR)/$(am__dirstamp) | ||
4819 | 1286 | test/gtest_no_test_unittest$(EXEEXT): $(test_gtest_no_test_unittest_OBJECTS) $(test_gtest_no_test_unittest_DEPENDENCIES) test/$(am__dirstamp) | ||
4820 | 1287 | @rm -f test/gtest_no_test_unittest$(EXEEXT) | ||
4821 | 1288 | $(CXXLINK) $(test_gtest_no_test_unittest_OBJECTS) $(test_gtest_no_test_unittest_LDADD) $(LIBS) | ||
4822 | 1289 | test/gtest_output_test_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4823 | 1290 | test/$(DEPDIR)/$(am__dirstamp) | ||
4824 | 1291 | test/gtest_output_test_$(EXEEXT): $(test_gtest_output_test__OBJECTS) $(test_gtest_output_test__DEPENDENCIES) test/$(am__dirstamp) | ||
4825 | 1292 | @rm -f test/gtest_output_test_$(EXEEXT) | ||
4826 | 1293 | $(CXXLINK) $(test_gtest_output_test__OBJECTS) $(test_gtest_output_test__LDADD) $(LIBS) | ||
4827 | 1294 | test/gtest_pred_impl_unittest.$(OBJEXT): test/$(am__dirstamp) \ | ||
4828 | 1295 | test/$(DEPDIR)/$(am__dirstamp) | ||
4829 | 1296 | test/gtest_pred_impl_unittest$(EXEEXT): $(test_gtest_pred_impl_unittest_OBJECTS) $(test_gtest_pred_impl_unittest_DEPENDENCIES) test/$(am__dirstamp) | ||
4830 | 1297 | @rm -f test/gtest_pred_impl_unittest$(EXEEXT) | ||
4831 | 1298 | $(CXXLINK) $(test_gtest_pred_impl_unittest_OBJECTS) $(test_gtest_pred_impl_unittest_LDADD) $(LIBS) | ||
4832 | 1299 | test/gtest_prod_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4833 | 1300 | test/$(DEPDIR)/$(am__dirstamp) | ||
4834 | 1301 | test/production.$(OBJEXT): test/$(am__dirstamp) \ | ||
4835 | 1302 | test/$(DEPDIR)/$(am__dirstamp) | ||
4836 | 1303 | test/gtest_prod_test$(EXEEXT): $(test_gtest_prod_test_OBJECTS) $(test_gtest_prod_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4837 | 1304 | @rm -f test/gtest_prod_test$(EXEEXT) | ||
4838 | 1305 | $(CXXLINK) $(test_gtest_prod_test_OBJECTS) $(test_gtest_prod_test_LDADD) $(LIBS) | ||
4839 | 1306 | test/gtest_repeat_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4840 | 1307 | test/$(DEPDIR)/$(am__dirstamp) | ||
4841 | 1308 | test/gtest_repeat_test$(EXEEXT): $(test_gtest_repeat_test_OBJECTS) $(test_gtest_repeat_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4842 | 1309 | @rm -f test/gtest_repeat_test$(EXEEXT) | ||
4843 | 1310 | $(CXXLINK) $(test_gtest_repeat_test_OBJECTS) $(test_gtest_repeat_test_LDADD) $(LIBS) | ||
4844 | 1311 | test/gtest_sole_header_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4845 | 1312 | test/$(DEPDIR)/$(am__dirstamp) | ||
4846 | 1313 | test/gtest_sole_header_test$(EXEEXT): $(test_gtest_sole_header_test_OBJECTS) $(test_gtest_sole_header_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4847 | 1314 | @rm -f test/gtest_sole_header_test$(EXEEXT) | ||
4848 | 1315 | $(CXXLINK) $(test_gtest_sole_header_test_OBJECTS) $(test_gtest_sole_header_test_LDADD) $(LIBS) | ||
4849 | 1316 | test/gtest_stress_test.$(OBJEXT): test/$(am__dirstamp) \ | ||
4850 | 1317 | test/$(DEPDIR)/$(am__dirstamp) | ||
4851 | 1318 | test/gtest_stress_test$(EXEEXT): $(test_gtest_stress_test_OBJECTS) $(test_gtest_stress_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4852 | 1319 | @rm -f test/gtest_stress_test$(EXEEXT) | ||
4853 | 1320 | $(CXXLINK) $(test_gtest_stress_test_OBJECTS) $(test_gtest_stress_test_LDADD) $(LIBS) | ||
4854 | 1321 | test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.$(OBJEXT): \ | ||
4855 | 1322 | test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) | ||
4856 | 1323 | src/test_gtest_throw_on_failure_ex_test-gtest-all.$(OBJEXT): \ | ||
4857 | 1324 | src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) | ||
4858 | 1325 | test/gtest_throw_on_failure_ex_test$(EXEEXT): $(test_gtest_throw_on_failure_ex_test_OBJECTS) $(test_gtest_throw_on_failure_ex_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4859 | 1326 | @rm -f test/gtest_throw_on_failure_ex_test$(EXEEXT) | ||
4860 | 1327 | $(test_gtest_throw_on_failure_ex_test_LINK) $(test_gtest_throw_on_failure_ex_test_OBJECTS) $(test_gtest_throw_on_failure_ex_test_LDADD) $(LIBS) | ||
4861 | 1328 | test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.$(OBJEXT): \ | ||
4862 | 1329 | test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) | ||
4863 | 1330 | src/test_gtest_throw_on_failure_test_-gtest-all.$(OBJEXT): \ | ||
4864 | 1331 | src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) | ||
4865 | 1332 | test/gtest_throw_on_failure_test_$(EXEEXT): $(test_gtest_throw_on_failure_test__OBJECTS) $(test_gtest_throw_on_failure_test__DEPENDENCIES) test/$(am__dirstamp) | ||
4866 | 1333 | @rm -f test/gtest_throw_on_failure_test_$(EXEEXT) | ||
4867 | 1334 | $(test_gtest_throw_on_failure_test__LINK) $(test_gtest_throw_on_failure_test__OBJECTS) $(test_gtest_throw_on_failure_test__LDADD) $(LIBS) | ||
4868 | 1335 | test/gtest_uninitialized_test_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4869 | 1336 | test/$(DEPDIR)/$(am__dirstamp) | ||
4870 | 1337 | test/gtest_uninitialized_test_$(EXEEXT): $(test_gtest_uninitialized_test__OBJECTS) $(test_gtest_uninitialized_test__DEPENDENCIES) test/$(am__dirstamp) | ||
4871 | 1338 | @rm -f test/gtest_uninitialized_test_$(EXEEXT) | ||
4872 | 1339 | $(CXXLINK) $(test_gtest_uninitialized_test__OBJECTS) $(test_gtest_uninitialized_test__LDADD) $(LIBS) | ||
4873 | 1340 | test/gtest_unittest.$(OBJEXT): test/$(am__dirstamp) \ | ||
4874 | 1341 | test/$(DEPDIR)/$(am__dirstamp) | ||
4875 | 1342 | test/gtest_unittest$(EXEEXT): $(test_gtest_unittest_OBJECTS) $(test_gtest_unittest_DEPENDENCIES) test/$(am__dirstamp) | ||
4876 | 1343 | @rm -f test/gtest_unittest$(EXEEXT) | ||
4877 | 1344 | $(CXXLINK) $(test_gtest_unittest_OBJECTS) $(test_gtest_unittest_LDADD) $(LIBS) | ||
4878 | 1345 | test/test_gtest_use_own_tuple_test-gtest-param-test_test.$(OBJEXT): \ | ||
4879 | 1346 | test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) | ||
4880 | 1347 | test/test_gtest_use_own_tuple_test-gtest-param-test2_test.$(OBJEXT): \ | ||
4881 | 1348 | test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) | ||
4882 | 1349 | src/test_gtest_use_own_tuple_test-gtest-all.$(OBJEXT): \ | ||
4883 | 1350 | src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) | ||
4884 | 1351 | test/gtest_use_own_tuple_test$(EXEEXT): $(test_gtest_use_own_tuple_test_OBJECTS) $(test_gtest_use_own_tuple_test_DEPENDENCIES) test/$(am__dirstamp) | ||
4885 | 1352 | @rm -f test/gtest_use_own_tuple_test$(EXEEXT) | ||
4886 | 1353 | $(test_gtest_use_own_tuple_test_LINK) $(test_gtest_use_own_tuple_test_OBJECTS) $(test_gtest_use_own_tuple_test_LDADD) $(LIBS) | ||
4887 | 1354 | test/gtest_xml_outfile1_test_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4888 | 1355 | test/$(DEPDIR)/$(am__dirstamp) | ||
4889 | 1356 | test/gtest_xml_outfile1_test_$(EXEEXT): $(test_gtest_xml_outfile1_test__OBJECTS) $(test_gtest_xml_outfile1_test__DEPENDENCIES) test/$(am__dirstamp) | ||
4890 | 1357 | @rm -f test/gtest_xml_outfile1_test_$(EXEEXT) | ||
4891 | 1358 | $(CXXLINK) $(test_gtest_xml_outfile1_test__OBJECTS) $(test_gtest_xml_outfile1_test__LDADD) $(LIBS) | ||
4892 | 1359 | test/gtest_xml_outfile2_test_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4893 | 1360 | test/$(DEPDIR)/$(am__dirstamp) | ||
4894 | 1361 | test/gtest_xml_outfile2_test_$(EXEEXT): $(test_gtest_xml_outfile2_test__OBJECTS) $(test_gtest_xml_outfile2_test__DEPENDENCIES) test/$(am__dirstamp) | ||
4895 | 1362 | @rm -f test/gtest_xml_outfile2_test_$(EXEEXT) | ||
4896 | 1363 | $(CXXLINK) $(test_gtest_xml_outfile2_test__OBJECTS) $(test_gtest_xml_outfile2_test__LDADD) $(LIBS) | ||
4897 | 1364 | test/gtest_xml_output_unittest_.$(OBJEXT): test/$(am__dirstamp) \ | ||
4898 | 1365 | test/$(DEPDIR)/$(am__dirstamp) | ||
4899 | 1366 | test/gtest_xml_output_unittest_$(EXEEXT): $(test_gtest_xml_output_unittest__OBJECTS) $(test_gtest_xml_output_unittest__DEPENDENCIES) test/$(am__dirstamp) | ||
4900 | 1367 | @rm -f test/gtest_xml_output_unittest_$(EXEEXT) | ||
4901 | 1368 | $(CXXLINK) $(test_gtest_xml_output_unittest__OBJECTS) $(test_gtest_xml_output_unittest__LDADD) $(LIBS) | ||
4902 | 1369 | install-binSCRIPTS: $(bin_SCRIPTS) | ||
4903 | 1370 | @$(NORMAL_INSTALL) | ||
4904 | 1371 | test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" | ||
4905 | 1372 | @list='$(bin_SCRIPTS)'; for p in $$list; do \ | ||
4906 | 1373 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
4907 | 1374 | if test -f $$d$$p; then \ | ||
4908 | 1375 | f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ | ||
4909 | 1376 | echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ | ||
4910 | 1377 | $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ | ||
4911 | 1378 | else :; fi; \ | ||
4912 | 1379 | done | ||
4913 | 1380 | |||
4914 | 1381 | uninstall-binSCRIPTS: | ||
4915 | 1382 | @$(NORMAL_UNINSTALL) | ||
4916 | 1383 | @list='$(bin_SCRIPTS)'; for p in $$list; do \ | ||
4917 | 1384 | f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ | ||
4918 | 1385 | echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ | ||
4919 | 1386 | rm -f "$(DESTDIR)$(bindir)/$$f"; \ | ||
4920 | 1387 | done | ||
4921 | 1388 | |||
4922 | 1389 | mostlyclean-compile: | ||
4923 | 1390 | -rm -f *.$(OBJEXT) | ||
4924 | 1391 | -rm -f samples/sample1.$(OBJEXT) | ||
4925 | 1392 | -rm -f samples/sample1.lo | ||
4926 | 1393 | -rm -f samples/sample1_unittest.$(OBJEXT) | ||
4927 | 1394 | -rm -f samples/sample2.$(OBJEXT) | ||
4928 | 1395 | -rm -f samples/sample2.lo | ||
4929 | 1396 | -rm -f samples/sample2_unittest.$(OBJEXT) | ||
4930 | 1397 | -rm -f samples/sample3_unittest.$(OBJEXT) | ||
4931 | 1398 | -rm -f samples/sample4.$(OBJEXT) | ||
4932 | 1399 | -rm -f samples/sample4.lo | ||
4933 | 1400 | -rm -f samples/sample4_unittest.$(OBJEXT) | ||
4934 | 1401 | -rm -f samples/sample5_unittest.$(OBJEXT) | ||
4935 | 1402 | -rm -f samples/sample6_unittest.$(OBJEXT) | ||
4936 | 1403 | -rm -f samples/sample7_unittest.$(OBJEXT) | ||
4937 | 1404 | -rm -f samples/sample8_unittest.$(OBJEXT) | ||
4938 | 1405 | -rm -f src/gtest-death-test.$(OBJEXT) | ||
4939 | 1406 | -rm -f src/gtest-death-test.lo | ||
4940 | 1407 | -rm -f src/gtest-filepath.$(OBJEXT) | ||
4941 | 1408 | -rm -f src/gtest-filepath.lo | ||
4942 | 1409 | -rm -f src/gtest-port.$(OBJEXT) | ||
4943 | 1410 | -rm -f src/gtest-port.lo | ||
4944 | 1411 | -rm -f src/gtest-test-part.$(OBJEXT) | ||
4945 | 1412 | -rm -f src/gtest-test-part.lo | ||
4946 | 1413 | -rm -f src/gtest-typed-test.$(OBJEXT) | ||
4947 | 1414 | -rm -f src/gtest-typed-test.lo | ||
4948 | 1415 | -rm -f src/gtest.$(OBJEXT) | ||
4949 | 1416 | -rm -f src/gtest.lo | ||
4950 | 1417 | -rm -f src/gtest_main.$(OBJEXT) | ||
4951 | 1418 | -rm -f src/gtest_main.lo | ||
4952 | 1419 | -rm -f src/test_gtest_no_rtti_test-gtest-all.$(OBJEXT) | ||
4953 | 1420 | -rm -f src/test_gtest_no_rtti_test-gtest_main.$(OBJEXT) | ||
4954 | 1421 | -rm -f src/test_gtest_throw_on_failure_ex_test-gtest-all.$(OBJEXT) | ||
4955 | 1422 | -rm -f src/test_gtest_throw_on_failure_test_-gtest-all.$(OBJEXT) | ||
4956 | 1423 | -rm -f src/test_gtest_tuple_test-gtest-all.$(OBJEXT) | ||
4957 | 1424 | -rm -f src/test_gtest_tuple_test-gtest_main.$(OBJEXT) | ||
4958 | 1425 | -rm -f src/test_gtest_use_own_tuple_test-gtest-all.$(OBJEXT) | ||
4959 | 1426 | -rm -f test/gtest-filepath_test.$(OBJEXT) | ||
4960 | 1427 | -rm -f test/gtest-linked_ptr_test.$(OBJEXT) | ||
4961 | 1428 | -rm -f test/gtest-message_test.$(OBJEXT) | ||
4962 | 1429 | -rm -f test/gtest-options_test.$(OBJEXT) | ||
4963 | 1430 | -rm -f test/gtest-param-test2_test.$(OBJEXT) | ||
4964 | 1431 | -rm -f test/gtest-param-test_test.$(OBJEXT) | ||
4965 | 1432 | -rm -f test/gtest-port_test.$(OBJEXT) | ||
4966 | 1433 | -rm -f test/gtest-test-part_test.$(OBJEXT) | ||
4967 | 1434 | -rm -f test/gtest-typed-test2_test.$(OBJEXT) | ||
4968 | 1435 | -rm -f test/gtest-typed-test_test.$(OBJEXT) | ||
4969 | 1436 | -rm -f test/gtest-unittest-api_test.$(OBJEXT) | ||
4970 | 1437 | -rm -f test/gtest_break_on_failure_unittest_.$(OBJEXT) | ||
4971 | 1438 | -rm -f test/gtest_color_test_.$(OBJEXT) | ||
4972 | 1439 | -rm -f test/gtest_env_var_test_.$(OBJEXT) | ||
4973 | 1440 | -rm -f test/gtest_environment_test.$(OBJEXT) | ||
4974 | 1441 | -rm -f test/gtest_filter_unittest_.$(OBJEXT) | ||
4975 | 1442 | -rm -f test/gtest_help_test_.$(OBJEXT) | ||
4976 | 1443 | -rm -f test/gtest_list_tests_unittest_.$(OBJEXT) | ||
4977 | 1444 | -rm -f test/gtest_main_unittest.$(OBJEXT) | ||
4978 | 1445 | -rm -f test/gtest_no_test_unittest.$(OBJEXT) | ||
4979 | 1446 | -rm -f test/gtest_output_test_.$(OBJEXT) | ||
4980 | 1447 | -rm -f test/gtest_pred_impl_unittest.$(OBJEXT) | ||
4981 | 1448 | -rm -f test/gtest_prod_test.$(OBJEXT) | ||
4982 | 1449 | -rm -f test/gtest_repeat_test.$(OBJEXT) | ||
4983 | 1450 | -rm -f test/gtest_sole_header_test.$(OBJEXT) | ||
4984 | 1451 | -rm -f test/gtest_stress_test.$(OBJEXT) | ||
4985 | 1452 | -rm -f test/gtest_uninitialized_test_.$(OBJEXT) | ||
4986 | 1453 | -rm -f test/gtest_unittest.$(OBJEXT) | ||
4987 | 1454 | -rm -f test/gtest_xml_outfile1_test_.$(OBJEXT) | ||
4988 | 1455 | -rm -f test/gtest_xml_outfile2_test_.$(OBJEXT) | ||
4989 | 1456 | -rm -f test/gtest_xml_output_unittest_.$(OBJEXT) | ||
4990 | 1457 | -rm -f test/production.$(OBJEXT) | ||
4991 | 1458 | -rm -f test/test_gtest_death_test_test-gtest-death-test_test.$(OBJEXT) | ||
4992 | 1459 | -rm -f test/test_gtest_no_rtti_test-gtest_unittest.$(OBJEXT) | ||
4993 | 1460 | -rm -f test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.$(OBJEXT) | ||
4994 | 1461 | -rm -f test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.$(OBJEXT) | ||
4995 | 1462 | -rm -f test/test_gtest_tuple_test-gtest-tuple_test.$(OBJEXT) | ||
4996 | 1463 | -rm -f test/test_gtest_use_own_tuple_test-gtest-param-test2_test.$(OBJEXT) | ||
4997 | 1464 | -rm -f test/test_gtest_use_own_tuple_test-gtest-param-test_test.$(OBJEXT) | ||
4998 | 1465 | |||
4999 | 1466 | distclean-compile: | ||
5000 | 1467 | -rm -f *.tab.c |
The diff has been truncated for viewing.
Merged from Debian, reviewed Ubuntu delta and it still looks sane and appropriate.