[daemon-fix] fixed getting uid and pid when transport is not kdbus

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

diff --git a/Makefile.am b/Makefile.am
index 733abab..756ab8b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
-SUBDIRS=dbus bus doc tools test
-DIST_SUBDIRS=dbus bus doc tools test
+SUBDIRS=dbus bus tools test doc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dbus-1.pc 
+pkgconfig_DATA = dbus-1.pc
 
 DISTCLEANFILES =               \
        dbus-1.pc
 
 EXTRA_DIST =                   \
+       autogen.sh              \
        HACKING                 \
        dbus-1.pc.in            \
        cleanup-man-pages.sh    \
@@ -15,49 +15,22 @@ EXTRA_DIST =                        \
         NEWS.pre-1-0            \
        ChangeLog.pre-1-2       \
         NEWS.pre-1-2           \
-       README.windbus
+       README.valgrind         \
+       README.win              \
+       README.wince            \
+       README.cygwin           \
+       README.launchd          \
+       cmake
 
 all-local: Doxyfile
 
-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:
-       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
-       cat coverage-report.txt
-
-else
-coverage-report.txt:
-       echo "Need to reconfigure with --enable-gcov"
-
-check-coverage:
-       echo "Need to reconfigure with --enable-gcov"
-
-endif
-
 update-authors:
        git shortlog -s -e | cut -c 8- | sort > AUTHORS
+
+DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-xml-docs \
+       --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+include tools/lcov.am