dbus ChangeLog,1.614,1.615 Makefile.am,1.21,1.22

[Havoc Pennington]

Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv15368

Modified Files:
	ChangeLog Makefile.am 
Log Message:
2004-12-24  Havoc Pennington  <hp at redhat.com>

	* test/decode-gcov.c: change to use .gcno and .gcda files, but the
	file format has also changed and I haven't adapted to that yet
	
	* Makefile.am: load .gcno files from latest gcc



Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -d -r1.614 -r1.615
--- ChangeLog	23 Dec 2004 17:22:29 -0000	1.614
+++ ChangeLog	24 Dec 2004 17:54:01 -0000	1.615
@@ -1,3 +1,10 @@
+2004-12-24  Havoc Pennington  <hp at redhat.com>
+
+	* test/decode-gcov.c: change to use .gcno and .gcda files, but the
+	file format has also changed and I haven't adapted to that yet
+	
+	* Makefile.am: load .gcno files from latest gcc
+
 2004-12-23  John (J5) Palmieri  <johnp at redhat.com>
 	* Patch from Rob Taylor <robtaylor at fastmail.fm>
 

Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.am	25 Jul 2004 03:52:48 -0000	1.21
+++ Makefile.am	24 Dec 2004 17:54:01 -0000	1.22
@@ -59,20 +59,20 @@
 ## .PHONY so it always rebuilds it
 .PHONY: coverage-report.txt
 coverage-report.txt:
-	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 ;							  \
+	BBG_FILES=`find $(GCOV_DIRS) -name "*.bbg" -o -name "*.gcno"` ;			\
+	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' | sed -e 's/.gcno/.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