[nautilus] Replace shave with AM_SILENT_RULES
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [nautilus] Replace shave with AM_SILENT_RULES
- Date: Thu, 17 Dec 2009 12:10:06 +0000 (UTC)
commit b4f413314de5857867ef152384741c49f2613737
Author: Alexander Larsson <alexl redhat com>
Date: Thu Dec 17 13:09:08 2009 +0100
Replace shave with AM_SILENT_RULES
configure.in | 5 +--
eel/Makefile.am | 6 +-
libnautilus-private/Makefile.am | 4 +-
m4/shave-libtool.in | 69 ----------------------------------
m4/shave.in | 79 ---------------------------------------
m4/shave.m4 | 77 --------------------------------------
6 files changed, 6 insertions(+), 234 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7197b16..10c2c91 100644
--- a/configure.in
+++ b/configure.in
@@ -31,6 +31,7 @@ AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.9 tar-ustar])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE
AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
@@ -426,8 +427,6 @@ AC_ARG_ENABLE(update-mimedb,
enable_update_mimedb=yes)
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
-SHAVE_INIT([m4], [enable])
-
AC_CONFIG_FILES([
Makefile
cut-n-paste-code/Makefile
@@ -453,8 +452,6 @@ libnautilus-extension/Makefile
libnautilus-extension/libnautilus-extension.pc
libnautilus-extension/libnautilus-extension-uninstalled.pc
m4/Makefile
-m4/shave-libtool
-m4/shave
po/Makefile.in
src/Makefile
src/file-manager/Makefile
diff --git a/eel/Makefile.am b/eel/Makefile.am
index cb62871..75ffe0b 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -105,9 +105,9 @@ marshal_sources = \
$(NULL)
eel-marshal.h: eelmarshal.list $(GLIB_GENMARSHAL)
- $(GLIB_GENMARSHAL) $< --header --prefix=eel_marshal > $@
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=eel_marshal > $@
eel-marshal.c: eelmarshal.list $(GLIB_GENMARSHAL)
- $(GLIB_GENMARSHAL) $< --body --prefix=eel_marshal > $@
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --body --prefix=eel_marshal > $@
stamp_sources = \
eel-enums.defs \
@@ -120,7 +120,7 @@ stamps = \
$(NULL)
eel-makeenums-stamp: makeenums.pl $(eel_headers)
- $(PERL) $< defs $(filter-out $<,$^) > xgen-eed \
+ $(AM_V_GEN)$(PERL) $< defs $(filter-out $<,$^) > xgen-eed \
&& (cmp -s xgen-eed eel-enums.defs || mv -f xgen-eed eel-enums.defs) \
&& rm -f xgen-eed \
&& $(PERL) $< arrays $(filter-out $<,$^) > xgen-etbe \
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index e831d43..b2a47ce 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -214,9 +214,9 @@ endif
$(lib_LTLIBRARIES): $(dependency_static_libs)
nautilus-marshal.h: nautilus-marshal.list $(GLIB_GENMARSHAL)
- $(GLIB_GENMARSHAL) $< --header --prefix=nautilus_marshal > $@
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=nautilus_marshal > $@
nautilus-marshal-guts.c: nautilus-marshal.list $(GLIB_GENMARSHAL)
- $(GLIB_GENMARSHAL) $< --body --prefix=nautilus_marshal > $@
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --body --prefix=nautilus_marshal > $@
$(libnautilus_private_la_OBJECTS): $(marshal_sources)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]