* bus-win.patch: removed obsolates patches.

[platform/upstream/dbus.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 25beb75..f1101ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,26 +1,16 @@
-
-if HAVE_GLIB
-    GLIB_SUBDIR=glib
-    GLIB_PC=dbus-glib-1.0.pc
-endif
-
-if HAVE_QT
-   QT_SUBDIR=qt
-endif
-
-SUBDIRS=dbus bus test doc $(GLIB_SUBDIR) $(QT_SUBDIR) 
+SUBDIRS=dbus bus doc tools test
+DIST_SUBDIRS=dbus bus doc tools test
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dbus-1.0.pc $(GLIB_PC)
+pkgconfig_DATA = dbus-1.pc 
 
 DISTCLEANFILES =               \
-       dbus-1.0.pc             \
-       $(GLIB_PC)
+       dbus-1.pc
 
 EXTRA_DIST =                   \
        HACKING                 \
-       dbus-1.0.pc.in          \
-       dbus-glib-1.0.pc.in
+       dbus-1.pc.in            \
+       cleanup-man-pages.sh
 
 all-local: Doxyfile
 
@@ -28,19 +18,28 @@ 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 -name "*.bbg"` ;                                       \
-       C_FILES= ;                                                              \
-       for F in $$GCOV_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" -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
@@ -53,4 +52,4 @@ coverage-report.txt:
 check-coverage:
        echo "Need to reconfigure with --enable-gcov"
 
-endif
\ No newline at end of file
+endif