Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...

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

diff --git a/Makefile.am b/Makefile.am
index 628b69e..756ab8b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,64 +1,36 @@
-
-if HAVE_GLIB
-    GLIB_SUBDIR=glib
-    GLIB_PC=dbus-glib-1.pc
-endif
-
-if HAVE_QT
-   QT_SUBDIR=qt
-endif
-
-SUBDIRS=dbus bus test doc $(GLIB_SUBDIR) $(QT_SUBDIR) tools
+SUBDIRS=dbus bus tools test doc
 
 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 =                   \
+       autogen.sh              \
        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.valgrind         \
+       README.win              \
+       README.wince            \
+       README.cygwin           \
+       README.launchd          \
+       cmake
 
 all-local: Doxyfile
 
-if DBUS_BUILD_TESTS
-### nothing
-else
-check-local:
-       echo "You have to configure with --enable-tests to make check" ; \
-       exit 1
-endif
-
-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 dbus bus $(GLIB_SUBDIR) $(QT_SUBDIR) -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
+update-authors:
+       git shortlog -s -e | cut -c 8- | sort > AUTHORS
 
-else
-coverage-report.txt:
-       echo "Need to reconfigure with --enable-gcov"
+DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-xml-docs \
+       --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
-check-coverage:
-       echo "Need to reconfigure with --enable-gcov"
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-endif
+include tools/lcov.am