X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=a19d44057ce761ca1b2fbac4b0cc7fe81e81c02c;hb=96cb1542c22ad236e5bb0abbf3c5aede1c6b6e04;hp=25beb75e3971b1822cc34a6e327b7b1b23bedb4b;hpb=3a96e4ffd99ec3f125e1891155ecb751b6e313a1;p=platform%2Fupstream%2Fdbus.git

diff --git a/Makefile.am b/Makefile.am
index 25beb75..a19d440 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,56 +1,35 @@
-
-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) 
+SUBDIRS=dbus bus tools test doc
 
 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.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
-
-## .PHONY so it always rebuilds it
-.PHONY: coverage-report.txt
-coverage-report.txt:
-	GCOV_FILES=`find -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 ; 							\
-	$(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
\ No newline at end of file
+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