From e4763f1163da2cea56c4b81603c88f5010860af9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 16 Nov 2007 11:29:16 +0100
Subject: r25997: torture: fix variables passed by make gcov

metze
(This used to be commit 8f3d6f464f3a79c535fcdadcdc7b8b93c97744e9)
---
 source4/torture/config.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index d9c70131e6..7f615a785c 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -366,17 +366,21 @@ MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################
 
-GCOV_FLAGS = -ftest-coverage -fprofile-arcs
-GCOV_LIBS = -lgcov
+GCOV_CFLAGS = -ftest-coverage -fprofile-arcs
+GCOV_LDFLAGS = $(GCOV_CFLAGS) -lgcov
 
 COV_TARGET = test
 
+COV_VARS = \
+	CFLAGS="$(CFLAGS) $(GCOV_CFLAGS)" \
+	BNLD_FLAGS="$(BNLD_FLAGS) $(GCOV_LDFLAGS)" \
+	SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_LDFLAGS)" \
+	MDLD_FLAGS="$(MDLD_FLAGS) $(GCOV_LDFLAGS)" \
+	HOSTCC_FLAGS="$(HOSTCC_FLAGS) $(GCOV_CFLAGS)" \
+	HOSTLD_FLAGS="$(HOSTLD_FLAGS) $(GCOV_LDLAGS)"
+
 test_cov:
-	@$(MAKE) $(COV_TARGET) \
-		HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
-		CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
-		LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)" \
-		SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)"
+	@$(MAKE) $(COV_TARGET) $(COV_VARS)
 
 gcov: test_cov
 	for I in $(sort $(dir $(ALL_OBJS))); \
@@ -385,11 +389,7 @@ gcov: test_cov
 
 lcov-split: 
 	rm -f samba.info
-	@$(MAKE) $(COV_TARGET) \
-		HOSTCC_CFLAGS="$(HOSTCC_CFLAGS) $(GCOV_FLAGS)" \
-		CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
-		LDFLAGS="$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)" \
-		SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)" \
+	@$(MAKE) $(COV_TARGET) $(COV_VARS) \
 		TEST_OPTIONS="--analyse-cmd=\"lcov --base-directory `pwd` --directory . --capture --output-file samba.info -t\""
 	-rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
 	genhtml -o coverage samba.info
-- 
cgit