[json-glib] build: Clean up unnecessary complications

[Emmanuele Bassi <ebassi src gnome org>]

commit 45e06f80b97e4b2dc0d6a1a6c806013a07113262
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Dec 2 10:30:13 2013 +0000

    build: Clean up unnecessary complications
    
    We don't need a custom Makefile for quiet rules: AM_V_GEN is pretty much
    all we use anyway.
    
    The Makefile.am.gtest file is not included any longer, since we switched
    to TAP and GLib's own rules for unit testing.

 Makefile.am                           |   12 ++---
 build/autotools/Makefile.am           |    1 -
 build/autotools/Makefile.am.enums     |    4 +-
 build/autotools/Makefile.am.gitignore |    2 +-
 build/autotools/Makefile.am.gtest     |   74 ---------------------------------
 build/autotools/Makefile.am.marshal   |    4 +-
 build/autotools/Makefile.am.silent    |   11 -----
 configure.ac                          |    2 -
 doc/reference/Makefile.am             |   11 -----
 json-glib/Makefile.am                 |    2 -
 10 files changed, 10 insertions(+), 113 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3b9edab..d4e636d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,21 @@
-include $(top_srcdir)/build/autotools/Makefile.am.gtest
-include $(top_srcdir)/build/autotools/Makefile.am.silent
-
 ACLOCAL_AMFLAGS = -I build/autotools
 
+EXTRA_DIST =
+
 SUBDIRS = json-glib doc build po
 
 pcfiles = json-glib-1.0.pc
 
 json-glib-1.0.pc: json-glib.pc
-       $(QUIET_GEN)cp -f $< $@
+       $(AM_V_GEN)cp -f $< $@
 
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
-
 EXTRA_DIST += json-glib.pc.in
 
-CLEANFILES = $(pcfiles) test-report.xml
+CLEANFILES = $(pcfiles)
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-introspection
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --enable-maintainer-flags --enable-introspection
 
 dist-hook:
        @if test -d "$(srcdir)/.git"; then \
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index b669fa3..1e1f257 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -5,7 +5,6 @@ EXTRA_DIST = \
        glibtests.m4            \
        introspection.m4        \
        jh-catalog.m4           \
-       Makefile.am.silent      \
        Makefile.am.enums       \
        Makefile.am.marshal     \
        Makefile.am.gitignore   \
diff --git a/build/autotools/Makefile.am.enums b/build/autotools/Makefile.am.enums
index 0f34732..7e2e8a4 100644
--- a/build/autotools/Makefile.am.enums
+++ b/build/autotools/Makefile.am.enums
@@ -24,7 +24,7 @@ BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST += $(srcdir)/$(enum_tmpl_h) $(srcdir)/$(enum_tmpl_c)
 
 stamp-enum-types: $(glib_enum_headers) $(srcdir)/$(enum_tmpl_h)
-       $(QUIET_GEN)$(GLIB_MKENUMS) \
+       $(AM_V_GEN)$(GLIB_MKENUMS) \
                --template $(srcdir)/$(enum_tmpl_h) \
        $(glib_enum_headers) > xgen-eh \
        && (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
@@ -35,7 +35,7 @@ $(glib_enum_h): stamp-enum-types
        @true
 
 $(glib_enum_c): $(glib_enum_h) $(srcdir)/$(enum_tmpl_c)
-       $(QUIET_GEN)$(GLIB_MKENUMS) \
+       $(AM_V_GEN)$(GLIB_MKENUMS) \
                --template $(srcdir)/$(enum_tmpl_c) \
        $(glib_enum_headers) > xgen-ec \
        && cp -f xgen-ec $(glib_enum_c) \
diff --git a/build/autotools/Makefile.am.gitignore b/build/autotools/Makefile.am.gitignore
index cc122db..01611a8 100644
--- a/build/autotools/Makefile.am.gitignore
+++ b/build/autotools/Makefile.am.gitignore
@@ -21,7 +21,7 @@ $(srcdir)/.gitignore: Makefile.am
 gitignore: $(srcdir)/.gitignore
 
 gitignore-clean:
-       $(QUIET_RM)rm -f $(srcdir)/.gitignore
+       @rm -f $(srcdir)/.gitignore
 
 .PHONY: gitignore gitignore-clean
 
diff --git a/build/autotools/Makefile.am.marshal b/build/autotools/Makefile.am.marshal
index cab117d..f2b4996 100644
--- a/build/autotools/Makefile.am.marshal
+++ b/build/autotools/Makefile.am.marshal
@@ -23,7 +23,7 @@ BUILT_SOURCES += $(marshal_h) $(marshal_c)
 EXTRA_DIST += $(srcdir)/$(glib_marshal_list)
 
 stamp-marshal: $(glib_marshal_list)
-       $(QUIET_GEN)$(GLIB_GENMARSHAL) \
+       $(AM_V_GEN)$(GLIB_GENMARSHAL) \
                --prefix=$(glib_marshal_prefix) \
                --header \
        $(srcdir)/$(glib_marshal_list) > xgen-mh \
@@ -35,7 +35,7 @@ $(marshal_h): stamp-marshal
        @true
 
 $(marshal_c): $(marshal_h)
-       $(QUIET_GEN)(echo "#include \"$(marshal_h)\"" ; \
+       $(AM_V_GEN)(echo "#include \"$(marshal_h)\"" ; \
        $(GLIB_GENMARSHAL) \
                --prefix=$(glib_marshal_prefix) \
                --body \
diff --git a/configure.ac b/configure.ac
index b3d1117..570f570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,8 +126,6 @@ AC_SUBST(GLIB_PREFIX)
 
 PKG_CHECK_MODULES(JSON, [gobject-2.0 >= glib_req_version gio-2.0])
 
-AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"])
-
 dnl === Enable debug level ====================================================
 
 m4_define([debug_default], [m4_if(m4_eval(json_minor_version % 2), [1], [yes], [minimum])])
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 65328ed..822bd47 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -82,17 +82,6 @@ expand_content_files =
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
 GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
 
-# needed to avoid including Makefile.am.gtest which redeclares
-# EXTRA_DIST and generates a warning when the gtk-doc.make include
-# below
-test-report:
-       @true
-
-test:
-       @true
-
-check-local: test
-
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am
index 719b355..38ad56e 100644
--- a/json-glib/Makefile.am
+++ b/json-glib/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/build/autotools/Makefile.am.silent
-
 # preamble
 
 NULL =