Dist Readme.win instead of Readme.windbus

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

diff --git a/Makefile.am b/Makefile.am
index 2bf9a50..6931459 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,26 +1,22 @@
-
-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) tools
+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    \
+        ChangeLog.pre-1-0       \
+        NEWS.pre-1-0            \
+       ChangeLog.pre-1-2       \
+        NEWS.pre-1-2           \
+       README.win \
+       cmake
 
 all-local: Doxyfile
 
@@ -28,15 +24,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 ;                                                                          \
@@ -53,4 +58,10 @@ coverage-report.txt:
 check-coverage:
        echo "Need to reconfigure with --enable-gcov"
 
-endif
\ No newline at end of file
+endif
+
+update-authors:
+       git shortlog -s -e | cut -c 8- | sort > AUTHORS
+
+DISTCHECK_CONFIGURE_FLAGS = \
+       --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)