diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-21 21:00:39 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-21 21:00:39 +0000 |
| commit | 37ad00d2c4409b4b3d629e1b0ae32bb814cec740 (patch) | |
| tree | 17a6af5bb668de01220cecfa9cebb0c9ab55dfe9 /src/Makefile.am | |
| parent | a6de64aef3e75dd0e0b2540280037139ef3d0066 (diff) | |
| download | protobuf-37ad00d2c4409b4b3d629e1b0ae32bb814cec740.tar.gz protobuf-37ad00d2c4409b4b3d629e1b0ae32bb814cec740.tar.bz2 protobuf-37ad00d2c4409b4b3d629e1b0ae32bb814cec740.zip | |
Update bundled gtest to latest version (1.3.0) and include it as a
nested autoconf package rather than as raw source. This way we can
trivially update it again in the future.
Actually, this change doesn't even include gtest in protobuf's SVN.
Instead, we auto-download it when autogen.sh is invoked. Note that
it will be included in release distributions, though.
TODO:
* Add a configure option to use the system's installed gtest rather
than the bundled copy. Apparently the gtest maintainers are working
on some general-purpose autoconf macros which will do this
automagically.
* Update MSVC project files.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8c0647b3..c12d3b9b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -179,12 +179,7 @@ EXTRA_DIST = \ google/protobuf/testdata/text_format_unittest_extensions_data.txt \ google/protobuf/package_info.h \ google/protobuf/io/package_info.h \ - google/protobuf/compiler/package_info.h \ - gtest/CHANGES \ - gtest/CONTRIBUTORS \ - gtest/COPYING \ - gtest/README \ - gtest/gen_gtest_pred_impl.py + google/protobuf/compiler/package_info.h protoc_outputs = \ google/protobuf/unittest.pb.cc \ @@ -221,7 +216,11 @@ unittest_proto_middleman: protoc$(EXEEXT) $(protoc_inputs) $(protoc_outputs): unittest_proto_middleman check_PROGRAMS = protobuf-test $(GZCHECKPROGRAMS) -protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la +protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ + $(top_builddir)/gtest/lib/libgtest.la \ + $(top_builddir)/gtest/lib/libgtest_main.la +protobuf_test_CPPFLAGS = -I$(top_srcdir)/gtest/include \ + -I$(top_builddir)/gtest/include protobuf_test_SOURCES = \ google/protobuf/stubs/common_unittest.cc \ google/protobuf/stubs/strutil_unittest.cc \ @@ -251,24 +250,7 @@ protobuf_test_SOURCES = \ google/protobuf/testing/googletest.cc \ google/protobuf/testing/googletest.h \ google/protobuf/testing/file.cc \ - google/protobuf/testing/file.h \ - gtest/gtest.cc \ - gtest/gtest.h \ - gtest/gtest-death-test.cc \ - gtest/gtest-death-test.h \ - gtest/gtest-filepath.cc \ - gtest/gtest-internal-inl.h \ - gtest/gtest-message.h \ - gtest/gtest-port.cc \ - gtest/gtest-spi.h \ - gtest/gtest_main.cc \ - gtest/gtest_pred_impl.h \ - gtest/gtest_prod.h \ - gtest/internal/gtest-death-test-internal.h \ - gtest/internal/gtest-filepath.h \ - gtest/internal/gtest-internal.h \ - gtest/internal/gtest-port.h \ - gtest/internal/gtest-string.h + google/protobuf/testing/file.h if HAVE_ZLIB zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la |