brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use AM_SILENT_RULES if automake >= 1.11 is installed

Browse Source 
Fixes bug:

  http://bugzilla.openedhand.com/show_bug.cgi?id=1756

Based on a patch by: Javier Jardón <javierjc1982@gmail.com>
This commit is contained in:
Emmanuele Bassi 2009-08-10 12:45:44 +02:00
parent 6a9130f10f
commit 373b165b3f
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/Makefile.am
View File

@ -1,7 +1,10 @@
NULL =
V = @
Q = $(V:1=)
if USE_SHAVE
QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
else
QUIET_GEN = $(AM_V_GEN)
endif # USE_SHAVE
SUBDIRS = cogl pango $(backendextra) $(clutterbackend)

6
clutter/cogl/Makefile.am
View File

@ -1,8 +1,10 @@
NULL =
V = @
Q = $(V:1=)
if USE_SHAVE
QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
else
QUIET_GEN = $(AM_V_GEN)
endif # USE_SHAVE
SUBDIRS = common $(CLUTTER_COGL)

7
clutter/cogl/common/Makefile.am
View File

@ -1,9 +1,10 @@
NULL =
V = @
Q = $(V:1=)
if USE_SHAVE
QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
QUIET_CP = $(Q:@=@echo ' CP '$@;)
else
QUIET_GEN = $(AM_V_GEN)
endif # USE_SHAVE
INCLUDES = \
-I$(top_srcdir) \

18
configure.ac
View File

@ -757,14 +757,26 @@ GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
dnl ===========================================================================
SHAVE_INIT([build/autotools], [enable])
m4_ifdef([AM_SILENT_RULES],
[
AM_SILENT_RULES([yes])
use_shave=no
],
[
SHAVE_INIT([build/autotools], [enable])
AC_CONFIG_FILES([
build/autotools/shave
build/autotools/shave-libtool
])
use_shave=yes
])
AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"])
AC_CONFIG_FILES([
Makefile
build/Makefile
build/autotools/Makefile
build/autotools/shave
build/autotools/shave-libtool
clutter/Makefile
clutter/clutter-version.h
clutter/clutter-json.h