dbus ChangeLog,1.428,1.429 Makefile.am,1.17,1.18

[Havoc Pennington]

Update of /cvs/dbus/dbus
In directory pdx:/tmp/cvs-serv12372

Modified Files:
	ChangeLog Makefile.am 
Log Message:
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



Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -d -r1.428 -r1.429
--- ChangeLog	16 Oct 2003 06:43:32 -0000	1.428
+++ ChangeLog	17 Oct 2003 16:23:19 -0000	1.429
@@ -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
 

Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.am	15 Oct 2003 21:09:40 -0000	1.17
+++ Makefile.am	17 Oct 2003 16:23:19 -0000	1.18
@@ -50,37 +50,25 @@
 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