diff options
author | Jon Skeet <skeet@pobox.com> | 2015-06-19 17:35:01 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-06-19 17:35:01 +0100 |
commit | 50a3a809e849fad5a53be5ccbaefaa02a106b535 (patch) | |
tree | 8c4441b6abee41b5e960e7013e5aeb6761616a22 /Makefile.am | |
parent | 8e9dd12b3a2a30dacf3b782d4062c43ec68ff2f6 (diff) | |
parent | 5b3a8e76356ef2dcb4a87c3fa7323bdec01cf7ce (diff) | |
download | protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.tar.gz protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.tar.bz2 protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.zip |
Merge remote-tracking branch 'upstream/master' into proto3-only
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 8d7bb563..37862005 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,28 +8,29 @@ AUTOMAKE_OPTIONS = foreign # the right time. SUBDIRS = . src -# Always include gtest in distributions. +# Always include gmock in distributions. DIST_SUBDIRS = $(subdirs) src conformance -# Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS -# because then "make check" would also build and run all of gtest's own tests, +# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS +# because then "make check" would also build and run all of gmock's own tests, # which takes a lot of time and is generally not useful to us. Also, we don't -# want "make install" to recurse into gtest since we don't want to overwrite -# the installed version of gtest if there is one. +# want "make install" to recurse into gmock since we don't want to overwrite +# the installed version of gmock if there is one. check-local: - @echo "Making lib/libgtest.a lib/libgtest_main.a in gtest" - @cd gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la + @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" + @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la + @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -# We would like to clean gtest when "make clean" is invoked. But we have to +# We would like to clean gmock when "make clean" is invoked. But we have to # be careful because clean-local is also invoked during "make distclean", but -# "make distclean" already recurses into gtest because it's listed among the -# DIST_SUBDIRS. distclean will delete gtest/Makefile, so if we then try to +# "make distclean" already recurses into gmock because it's listed among the +# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to # cd to the directory again and "make clean" it will fail. So, check that the # Makefile exists before recursing. clean-local: - @if test -e gtest/Makefile; then \ - echo "Making clean in gtest"; \ - cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \ + @if test -e gmock/Makefile; then \ + echo "Making clean in gmock"; \ + cd gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \ fi; \ if test -e conformance/Makefile; then \ echo "Making clean in conformance"; \ @@ -743,6 +744,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ LICENSE \ CONTRIBUTORS.txt \ CHANGES.txt \ + update_file_lists.sh \ cmake/CMakeLists.txt \ cmake/libprotobuf.cmake \ cmake/libprotobuf-lite.cmake \ @@ -750,7 +752,6 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ cmake/protoc.cmake \ cmake/README.md \ cmake/tests.cmake \ - cmake/update_file_lists.sh \ editors/README.txt \ editors/proto.vim \ editors/protobuf-mode.el \ |