X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=45183cb0c153ae2e0e37d224f1caf8177c63dc03;hb=1962bd7b478b21ae054b836f41e944f2a45f6621;hp=73a34f42213cdfcf0cb4181c02de6a12f10bdf80;hpb=36133656acf7169b0e242a386e8cbed19a9466ad;p=platform%2Fupstream%2Fdbus.git

diff --git a/Makefile.am b/Makefile.am
index 73a34f4..45183cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,69 +1,54 @@
-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
 
-DISTCLEANFILES = 		\
-	dbus-1.pc
+cmakeconfigdir = $(libdir)/cmake/DBus1
+cmakeconfig_DATA = cmake/DBus1Config.cmake       \
+                   cmake/DBus1ConfigVersion.cmake
 
 EXTRA_DIST =			\
-	HACKING			\
+	autogen.sh		\
+	CONTRIBUTING.md		\
 	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.windbus		\
-	cmake
+	README.cmake		\
+	README.valgrind		\
+	README.win		\
+	README.wince		\
+	README.cygwin		\
+	README.launchd		\
+	cmake/CMakeLists.txt \
+	cmake/ConfigureChecks.cmake \
+	cmake/DBus1Config.cmake.in \
+	cmake/DBus1Config.pkgconfig.in \
+	cmake/DBus1ConfigVersion.cmake.in \
+	cmake/bus \
+	cmake/bus-test.bat.cmake \
+	cmake/config.h.cmake \
+	cmake/dbus \
+	cmake/dbus-env.bat.cmake \
+	cmake/doc \
+	cmake/i686-w64-mingw32.cmake \
+	cmake/modules \
+	cmake/test \
+	cmake/tools \
+	$(NULL)
 
 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_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+# Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+include $(top_srcdir)/aminclude_static.am