From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 9 Aug 2011 22:21:53 +0000 (-0700)
Subject: Makefile.am: build gtest in debug builds
X-Git-Tag: v0.34~81^2~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e442a2c3773dc33dbbc345f4295b909ea3ba8de5;p=ceph.git

Makefile.am: build gtest in debug builds

Formerly, we only built gtest when doing 'make check'. However, the
librados-api tests, which are built in debug mode for the 'all' target,
also use gtest. So build it when needed.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---

diff --git a/Makefile.am b/Makefile.am
index 7e79c1f8bcc7..4e3386b1ecb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,13 +9,18 @@ EXTRA_DIST += \
 	src/test/downloads \
 	udev/50-rbd.rules
 
-check-local:
-#	Build gtest before we build our own tests. Doing this instead
-#	of SUBDIRS because with that, gtest's own tests would be run
-#	and that would slow us down.
-	@echo "Making lib/libgtest.a lib/libgtest_main.a in src/gtest"
+
+all-local:
+if WITH_DEBUG
+#	We need gtest to build the rados-api tests. We only build those in
+#	a debug build, though.
 	@cd src/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+endif
 
+check-local:
+#	We build gtest this way, instead of using SUBDIRS, because with that,
+#	gtest's own tests would be run and that would slow us down.
+	@cd src/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
 #	exercise cli tools
 	$(srcdir)/src/test/run-cli-tests '$(top_builddir)/src/test'