[network-manager-netbook] Use automake 1.11 quiet feature instead of shave.



commit 5c048092c41dc082ff9eda681eb18896581de041
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Sep 29 14:58:35 2009 +0300

    Use automake 1.11 quiet feature instead of shave.
    
    Patch from bgo #596719.

 configure.in                |    7 +--
 shave-libtool.in            |  109 -------------------------------------------
 shave.in                    |  109 -------------------------------------------
 src/marshallers/Makefile.am |    4 +-
 4 files changed, 5 insertions(+), 224 deletions(-)
---
diff --git a/configure.in b/configure.in
index 39c2779..6d5590b 100644
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,9 @@ AM_MAINTAINER_MODE
 
 AC_CONFIG_HEADERS(config.h)
 
+# Enable silent build when available (Automake 1.11)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 dnl Required programs
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -25,12 +28,8 @@ PKG_CHECK_MODULES(NMN, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 li
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
-SHAVE_INIT([.], [enable])
-
 AC_CONFIG_FILES([
 Makefile
-shave
-shave-libtool
 icons/Makefile
 icons/22/Makefile
 icons/32/Makefile
diff --git a/src/marshallers/Makefile.am b/src/marshallers/Makefile.am
index 6ad83fc..a4f8458 100644
--- a/src/marshallers/Makefile.am
+++ b/src/marshallers/Makefile.am
@@ -16,10 +16,10 @@ EXTRA_DIST = nma-marshal.list
 CLEANFILES = $(BUILT_SOURCES)
 
 nma-marshal.h: nma-marshal.list
-	$(GLIB_GENMARSHAL) $< --prefix=nma_marshal --header > $@
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --prefix=nma_marshal --header > $@
 
 nma-marshal.c: nma-marshal.list
-	$(GLIB_GENMARSHAL) $< --prefix=nma_marshal --body > $@
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --prefix=nma_marshal --body > $@
 
 nma-marshal-main.c: nma-marshal.c nma-marshal.h
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]