Merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654 into lp:ubuntu/lucid/protobuf

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
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+17571@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

Merged from Debian, reviewed Ubuntu delta and it still looks sane and appropriate.

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

Subscribers

People subscribed via source and target branches

to all changes: