[kdbus] Do not set body message if signature field is empty

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

diff --git a/Makefile.am b/Makefile.am
index 9ee0acd..a1c9c33 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,20 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/glib.mk
 
-AUTOMAKE_OPTIONS = 1.7
+# http://people.gnome.org/~walters/docs/build-api.txt
+.buildapi-allow-builddir:
 
-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
+ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
 DIST_SUBDIRS = $(SUBDIRS) build
 
 bin_SCRIPTS = glib-gettextize
 
+if OS_LINUX
+TESTS += check-abis.sh
+endif
+
 AM_CPPFLAGS =                                  \
        -DG_LOG_DOMAIN=g_log_domain_glib        \
        @GLIB_DEBUG_FLAGS@                      \
@@ -33,15 +40,16 @@ EXTRA_DIST +=                       \
        sanity_check            \
        README.commits          \
        README.in               \
+       README.rationale        \
        INSTALL.in              \
        README.win32            \
        HACKING                 \
-       MAINTAINERS             \
        autogen.sh              \
-       Makefile.decl           \
-       mkinstalldirs           \
+       glib.mk                 \
+       glib-tap.mk             \
+       tap-driver.sh           \
+       tap-test                \
        makefile.msc            \
-       glibconfig.h.win32.in   \
        msvc_recommended_pragmas.h \
        config.h.win32.in       \
         po/po2tbl.sed.in        \
@@ -54,40 +62,21 @@ EXTRA_DIST +=                       \
        gio-2.0.pc.in           \
        gio-unix-2.0.pc.in      \
        gio-windows-2.0.pc.in   \
-       glib-2.0-uninstalled.pc.in      \
-       gobject-2.0-uninstalled.pc.in   \
-       gmodule-2.0-uninstalled.pc.in   \
-       gthread-2.0-uninstalled.pc.in   \
-       gmodule-no-export-2.0-uninstalled.pc.in \
-       gio-2.0-uninstalled.pc.in               \
-       gio-unix-2.0-uninstalled.pc.in
+       check-abis.sh           \
+       gtk-doc.make            \
+       $(NULL)
 
 
 # These may be in the builddir too
-BUILT_EXTRA_DIST =             \
+BUILT_EXTRA_DIST +=            \
        README                  \
        INSTALL                 \
        ChangeLog               \
-       glibconfig.h.win32      \
        config.h.win32          \
-       gtk-doc.make
-
-configexecincludedir = $(libdir)/glib-2.0/include
-configexecinclude_DATA = glibconfig.h
-
-uninstall-local:
-       rm -f $(DESTDIR)$(configexecincludedir)/glibconfig.h
+       $(NULL)
 
 CONFIGURE_DEPENDENCIES = acglib.m4
 
-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-glibconfig.h: stamp-gc-h
-       $(AM_V_GEN) if test -f glibconfig.h; then :; \
-       else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
-stamp-gc-h: config.status
-       cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
-       echo timestamp > stamp-gc-h
-
 ChangeLog:
        $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
          (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GLIB_2_20_0^^.. --stat) | fmt --split-only > $@.tmp \
@@ -114,14 +103,10 @@ endif
 
 $(pkgconfig_DATA): config.status
 
-# install mkinstalldirs for glib-gettextize's benefit
-gettextdir = $(datadir)/glib-2.0/gettext
-gettext_SCRIPTS = mkinstalldirs
-
 # build documentation when doing distcheck
-DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man
+DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-gtk-doc --enable-man --disable-maintainer-mode
 
-DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h config.lt
+DISTCLEANFILES += config.lt
 
 distclean-local: lcov-clean
        if test $(srcdir) = .; then :; else \