From 8a4d94fe70982690c5fe4580f906b8ca2a95c468 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Fri, 17 Oct 2003 16:23:19 +0000
Subject: [PATCH] 2003-10-16  Havoc Pennington  <hp@redhat.com>

	* glib/dbus-gtest-main.c: bracket with #ifdef DBUS_BUILD_TESTS

	* Makefile.am (GCOV_DIRS): remove "test", we don't care about test
	coverage of the tests
	(coverage-report.txt): don't move the .da and .bbg files around
---
 ChangeLog              |  8 ++++++++
 Makefile.am            | 42 +++++++++++++++---------------------------
 glib/dbus-gtest-main.c |  5 +++++
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf2365f..3a1f06a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-10-16  Havoc Pennington  <hp@redhat.com>
 
+	* glib/dbus-gtest-main.c: bracket with #ifdef DBUS_BUILD_TESTS
+
+	* Makefile.am (GCOV_DIRS): remove "test", we don't care about test
+	coverage of the tests
+	(coverage-report.txt): don't move the .da and .bbg files around
+
+2003-10-16  Havoc Pennington  <hp@redhat.com>
+
 	* bus/bus.c (struct BusContext): remove struct field I didn't mean
 	to put there
 
diff --git a/Makefile.am b/Makefile.am
index fce4862..82fee34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,37 +50,25 @@ clean-gcov:
 clean-bbg:
 	find -name "*.bbg" -o -name "*.bb" | xargs rm || true
 
-GCOV_DIRS=dbus bus test $(GLIB_SUBDIR) $(QT_SUBDIR)
+GCOV_DIRS=dbus bus $(GLIB_SUBDIR) $(QT_SUBDIR)
 
 ## .PHONY so it always rebuilds it
 .PHONY: coverage-report.txt
 coverage-report.txt:
-	BBG_FILES=`find $(GCOV_DIRS) -name "*.bbg"` ;					\
-	for F in $$BBG_FILES ; do							\
-		F_nolibs=`echo $$F | sed -e 's/.libs\///g'` ;				\
-		if test $$F != $$F_nolibs ; then					\
-			echo "Moving $$F to $$F_nolibs"	;				\
-			mv -f $$F $$F_nolibs ;						\
-		fi ;									\
-	done	;									\
-	DA_FILES=`find $(GCOV_DIRS) -name "*.da"` ;					\
-	for F in $$DA_FILES ; do							\
-		F_nolibs=`echo $$F | sed -e 's/.libs\///g'` ;				\
-		if test $$F != $$F_nolibs ; then					\
-			echo "Moving $$F to $$F_nolibs"	;				\
-			mv -f $$F $$F_nolibs ;						\
-		fi ;									\
-	done	;									\
-	BBG_FILES=`find $(GCOV_DIRS) -name "*.bbg"` ;					\
-	C_FILES= ;									\
-	for F in $$BBG_FILES ; do							\
-		C=`echo $$F | sed -e 's/.bbg/.c/g'` ;					\
-		DA=`echo $$F | sed -e 's/.bbg/.da/g'` ;					\
-		if test -e $$DA ; then							\
-			C_FILES="$$C_FILES $$C" ;					\
-		fi ;									\
-	done ;										\
-	echo $$C_FILES ;								\
+	BBG_FILES=`find $(GCOV_DIRS) -name "*.bbg"` ;				  \
+	C_FILES= ;								  \
+	for F in $$BBG_FILES ; do						  \
+		F_nolibs=`echo $$F | sed -e 's/.libs\///g'` ;			  \
+		C=`echo $$F_nolibs | sed -e 's/.bbg/.c/g'` ;			  \
+		B=`basename $$F .bbg` ;						  \
+		D=`dirname $$F` ;						  \
+		DA=`echo $$F | sed -e 's/.bbg/.da/g'` ;				  \
+		DA_libs=`echo $$D/.libs/$$B/.da` ;				  \
+		if test -e $$DA || test -e $$DA_libs; then			  \
+			C_FILES="$$C_FILES $$C" ;				  \
+		fi ;								  \
+	done ;									  \
+	echo $$C_FILES ;							  \
 	$(top_builddir)/test/decode-gcov --report $$C_FILES > coverage-report.txt
 
 check-coverage: clean-gcov all check coverage-report.txt
diff --git a/glib/dbus-gtest-main.c b/glib/dbus-gtest-main.c
index 5cc6cb7..5ab1246 100644
--- a/glib/dbus-gtest-main.c
+++ b/glib/dbus-gtest-main.c
@@ -20,6 +20,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#include <config.h>
+
+#ifdef DBUS_BUILD_TESTS
 
 #include "dbus-gtest.h"
 #include <stdio.h>
@@ -44,3 +47,5 @@ main (int    argc,
   
   return 0;
 }
+
+#endif
-- 
2.7.4