X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=8ce8d5b063bd7ed06f5ad5c20630df2793759435;hb=75ef1d2ed45d8cd2855f1b3a100a61ea9cc853a3;hp=200ee64e394b5d0966f2d46e3bb78437fcf5ea90;hpb=3251264ac483680b4a5fe808729f7e3b34f41fd4;p=platform%2Fupstream%2Fdbus.git

diff --git a/Makefile.am b/Makefile.am
index 200ee64..8ce8d5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,45 +1,22 @@
-
-if HAVE_GLIB
-    GLIB_SUBDIR=glib
-    GLIB_PC=dbus-glib-1.pc
-endif
-
-if HAVE_QT
-   QT_SUBDIR=qt
-endif
-
-if DBUS_USE_GCJ
-   GCJ_SUBDIR=gcj
-endif
-
-if DBUS_USE_MCS
-   MONO_SUBDIR=mono
-endif
-
-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
+SUBDIRS=dbus bus doc tools test
+DIST_SUBDIRS=dbus bus doc tools test
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dbus-1.pc $(GLIB_PC)
+pkgconfig_DATA = dbus-1.pc
 
 DISTCLEANFILES = 		\
-	dbus-1.pc		\
-	$(GLIB_PC)
+	dbus-1.pc
 
 EXTRA_DIST =			\
 	HACKING			\
 	dbus-1.pc.in		\
-	dbus-glib-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
 
@@ -47,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 ;										\
@@ -73,3 +59,11 @@ check-coverage:
 	echo "Need to reconfigure with --enable-gcov"
 
 endif
+
+update-authors:
+	git shortlog -s -e | cut -c 8- | sort > AUTHORS
+
+DISTCHECK_CONFIGURE_FLAGS = \
+	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
+ACLOCAL_AMFLAGS = -I m4