X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=f521470278758e50603da1d0125ab55fa65cec01;hb=19d48c3344fa0b43d960c2f0b8b5fbb2f9f8cb86;hp=4b733db9271616d7f4e38ed456f57fe682888f16;hpb=f0f4335bd97732d156f0b35762f61ba2d88514ab;p=platform%2Fupstream%2Fdbus.git

diff --git a/Makefile.am b/Makefile.am
index 4b733db..f521470 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,26 +1,21 @@
-
-if HAVE_GLIB
-    GLIB_SUBDIR=glib
-    GLIB_PC=dbus-glib-1.pc
-endif
-
-if HAVE_QT
-   QT_SUBDIR=qt
-endif
-
-SUBDIRS=dbus bus test doc $(GLIB_SUBDIR) $(QT_SUBDIR) tools
+SUBDIRS=dbus bus doc tools test
+DIST_SUBDIRS=dbus bus doc tools test
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dbus-1.pc $(GLIB_PC)
+pkgconfig_DATA = dbus-1.pc 
 
 DISTCLEANFILES = 		\
-	dbus-1.pc		\
-	$(GLIB_PC)
+	dbus-1.pc
 
 EXTRA_DIST =			\
 	HACKING			\
 	dbus-1.pc.in		\
-	dbus-glib-1.pc.in
+	cleanup-man-pages.sh    \
+        ChangeLog.pre-1-0       \
+        NEWS.pre-1-0            \
+	ChangeLog.pre-1-2       \
+        NEWS.pre-1-2		\
+	README.windbus
 
 all-local: Doxyfile
 
@@ -28,15 +23,24 @@ if DBUS_GCOV_ENABLED
 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
+
 ## .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" -o -name "*.gcno"` ;			\
 	C_FILES= ;									\
-	for F in $$GCOV_FILES; do							\
-		C=`echo $$F | sed -e 's/.bbg/.c/g'` ;					\
+	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'` ;					\
-		if test -e $$DA ; then							\
+		DA_libs=`echo $$D/.libs/$$B/.da` ;					\
+		if test -e $$DA || test -e $$DA_libs; then				\
 			C_FILES="$$C_FILES $$C" ;					\
 		fi ;									\
 	done ;										\