thanksgiving break, lets start working on those bindings.

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

diff --git a/Makefile.am b/Makefile.am
index 4732997..82fee34 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,13 @@ if HAVE_PYTHON
    PYTHON_SUBDIR=python
 endif
 
+## really we should require gcj/mcs/python also but since they are 
+## annoying to install, we don't for now
+dist-local:
+       if test -z "$(QT_SUBDIR)" || test -z "$(GLIB_SUBDIR)" ; then            \
+               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
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -40,19 +47,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 $(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"` ;          \
-       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"` ;                             \
+       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 ;                                                          \
        $(top_builddir)/test/decode-gcov --report $$C_FILES > coverage-report.txt
 
 check-coverage: clean-gcov all check coverage-report.txt