dbus ChangeLog,1.424,1.425 Makefile.am,1.16,1.17

[Havoc Pennington]

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
2003-10-14  Havoc Pennington  <hp@redhat.com>

	* test/decode-gcov.c: support gcc 3.3 also, though gcc 3.3 seems
	to have a bug keeping it from outputting the .da files sometimes
	(string_get_string): don't append garbage nul bytes to the string.



Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -d -r1.424 -r1.425
--- ChangeLog	15 Oct 2003 11:55:38 -0000	1.424
+++ ChangeLog	15 Oct 2003 21:09:40 -0000	1.425
@@ -1,3 +1,9 @@
+2003-10-14  Havoc Pennington  <hp@redhat.com>
+
+	* test/decode-gcov.c: support gcc 3.3 also, though gcc 3.3 seems
+	to have a bug keeping it from outputting the .da files sometimes
+	(string_get_string): don't append garbage nul bytes to the string.
+
 2003-10-15  Seth Nickell  <seth@gnome.org>
 
 	* python/Makefile.am:

Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	14 Oct 2003 22:16:03 -0000	1.16
+++ Makefile.am	15 Oct 2003 21:09:40 -0000	1.17
@@ -47,12 +47,33 @@
 clean-gcov:
 	find -name "*.da" -o -name "*.gcov" | xargs rm || true
 
+clean-bbg:
+	find -name "*.bbg" -o -name "*.bb" | xargs rm || true
+
+GCOV_DIRS=dbus bus test $(GLIB_SUBDIR) $(QT_SUBDIR)
+
 ## .PHONY so it always rebuilds it
 .PHONY: coverage-report.txt
 coverage-report.txt:
-	GCOV_FILES=`find dbus bus $(GLIB_SUBDIR) $(QT_SUBDIR) -name "*.bbg"` ;		\
+	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 $$GCOV_FILES; do							\
+	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							\