Oops, forgot part of the patch. Same ChangeLog entry.

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

diff --git a/Makefile.am b/Makefile.am
index 47ac1de..816d653 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,11 @@ endif
 
 if HAVE_QT
    QT_SUBDIR=qt
+   QT_PC=dbus-qt4-1.pc
+endif
+
+if HAVE_QT3
+   QT3_SUBDIR=qt3
 endif
 
 if DBUS_USE_GCJ
@@ -28,21 +33,23 @@ dist-local:
                echo "You have to build with Qt and GLib to make dist" ;        \
        fi 
 
-SUBDIRS=dbus bus doc $(GLIB_SUBDIR) $(GCJ_SUBDIR) $(MONO_SUBDIR) $(QT_SUBDIR) $(PYTHON_SUBDIR) test tools
-DIST_SUBDIRS=dbus bus doc glib qt gcj mono python test tools
+SUBDIRS=dbus bus doc $(GLIB_SUBDIR) $(GCJ_SUBDIR) $(MONO_SUBDIR) $(QT_SUBDIR) $(QT3_SUBDIR) $(PYTHON_SUBDIR) tools test
+DIST_SUBDIRS=dbus bus doc glib qt qt3 gcj mono python tools test
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dbus-1.pc $(GLIB_PC) $(MONO_PC)
+pkgconfig_DATA = dbus-1.pc $(GLIB_PC) $(QT_PC) $(MONO_PC)
 
 DISTCLEANFILES =               \
        dbus-1.pc               \
        $(GLIB_PC)              \
+       $(QT_PC)                \
        $(MONO_PC)
 
 EXTRA_DIST =                   \
        HACKING                 \
        dbus-1.pc.in            \
        dbus-glib-1.pc.in       \
+       dbus-qt4-1.pc.in        \
        dbus-sharp.pc.in
 
 all-local: Doxyfile
@@ -59,20 +66,20 @@ 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"` ;                             \
-       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