diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-02-19 01:27:32 +0100 |
|---|---|---|
| committer | Alberto Garcia <agarcia@igalia.com> | 2010-02-22 13:27:26 +0100 |
| commit | 97020f99bcb1b1825a46082552e14cc9e0251f34 (patch) | |
| tree | f313518a8140f8f0ad6d4af422ef924392d4337b | |
| parent | b98711451647595e758b0d77c6f9921fce8cf9dc (diff) | |
Support silent build rules with automake 1.11
Support silent build rules, requires at least automake-1.11.
Disable by either passing --disable-silent-rules to configure or
passing V=1 to make.
Fixes https://bugs.maemo.org/show_bug.cgi?id=5147
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | hildon/Makefile.am | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 209fe59..c6e68a2 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,11 @@ AC_SUBST(API_VERSION_MAJOR) AS_LIBTOOL(HILDON, 18, 7, 18) AM_INIT_AUTOMAKE +# Support silent build rules, requires at least automake-1.11. Disable +# by either passing --disable-silent-rules to configure or passing V=1 +# to make +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AC_PROG_CC AM_PROG_CC_C_O AM_PROG_LIBTOOL diff --git a/hildon/Makefile.am b/hildon/Makefile.am index 10f1c91..b0049ff 100644 --- a/hildon/Makefile.am +++ b/hildon/Makefile.am @@ -204,7 +204,7 @@ noinst_HEADERS = hildon-calendar-popup-private.h \ $(OBJECTS) $(libhildon_$(API_VERSION_MAJOR)_la_OBJECTS): hildon-enum-types.h hildon-marshalers.c hildon-marshalers.h hildon-enum-types.h: @REBUILD@ $(libhildon_$(API_VERSION_MAJOR)_public_headers) Makefile - (cd $(srcdir) && glib-mkenums \ + $(AM_V_GEN) (cd $(srcdir) && glib-mkenums \ --fhead "#ifndef __HILDON_ENUM_TYPES_H__\n" \ --fhead "#define __HILDON_ENUM_TYPES_H__\n" \ --fhead "\n" \ @@ -218,7 +218,7 @@ hildon-enum-types.h: @REBUILD@ $(libhildon_$(API_VERSION_MAJOR)_public_headers) $(libhildon_$(API_VERSION_MAJOR)_public_headers)) > $@ hildon-enum-types.c: @REBUILD@ $(libhildon_$(API_VERSION_MAJOR)_public_headers) Makefile - (cd $(srcdir) && glib-mkenums \ + $(AM_V_GEN) (cd $(srcdir) && glib-mkenums \ --fhead "#undef HILDON_DISABLE_DEPRECATED\n" \ --fhead "#include \"hildon.h\"\n" \ --fhead "#include <glib-object.h>" \ @@ -229,9 +229,9 @@ hildon-enum-types.c: @REBUILD@ $(libhildon_$(API_VERSION_MAJOR)_public_headers) $(libhildon_$(API_VERSION_MAJOR)_public_headers)) > $@ hildon-marshalers.h: hildon-marshalers.list - glib-genmarshal --prefix _hildon_marshal --header hildon-marshalers.list >hildon-marshalers.h + $(AM_V_GEN) glib-genmarshal --prefix _hildon_marshal --header hildon-marshalers.list >hildon-marshalers.h hildon-marshalers.c: hildon-marshalers.list hildon-marshalers.h - echo '#include "hildon-marshalers.h"' >hildon-marshalers.c - glib-genmarshal --prefix _hildon_marshal --body hildon-marshalers.list >>hildon-marshalers.c + $(AM_V_GEN) echo '#include "hildon-marshalers.h"' >hildon-marshalers.c + $(AM_V_at) glib-genmarshal --prefix _hildon_marshal --body hildon-marshalers.list >>hildon-marshalers.c |