[gvfs] Use $(AM_V_GEN) for more silent build
- From: Christian Kellner <gicmo src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gvfs] Use $(AM_V_GEN) for more silent build
- Date: Fri, 9 Oct 2009 08:31:06 +0000 (UTC)
commit 69b9daa667de926956a811ead53c9cf8532cfb88
Author: Christian Persch <chpe gnome org>
Date: Fri Oct 9 10:28:11 2009 +0200
Use $(AM_V_GEN) for more silent build
Closes bug #597104
Makefile.am | 3 +--
configure.ac | 1 +
daemon/Makefile.am | 8 ++++----
metadata/Makefile.am | 2 +-
monitor/afc/Makefile.am | 2 +-
monitor/gdu/Makefile.am | 2 +-
monitor/gphoto2/Makefile.am | 6 +++---
monitor/hal/Makefile.am | 6 +++---
8 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d729782..d996b8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,8 +33,7 @@ distclean-local:
fi
ChangeLog:
- @echo Creating $@
- @if test -d "$(srcdir)/.git"; then \
+ $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
(GIT_DIR=$(top_srcdir)/.git ./missing --run git log GVFS_1_2_2.. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $ tmp \
&& mv -f $ tmp $@ \
|| ($(RM) $ tmp; \
diff --git a/configure.ac b/configure.ac
index 3643161..a2c9932 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ AM_DISABLE_STATIC
AM_PROG_LIBTOOL
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AM_PROG_CC_C_O
+AC_PROG_SED
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index cf68391..5de92f8 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -28,14 +28,14 @@ libraries = \
# D-BUS service file
%.service: %.service.in ../config.log
- sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+ $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
servicedir = $(DBUS_SERVICE_DIR)
service_in_files = gvfs-daemon.service.in
service_DATA = gvfs-daemon.service
%.mount: %.mount.in ../config.log
- sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+ $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp
@@ -82,10 +82,10 @@ libexec_PROGRAMS += gvfsd-obexftp
BUILT_SOURCES = obexftp-marshal.c obexftp-marshal.h
obexftp-marshal.h: obexftp-marshal.list
- glib-genmarshal $< --prefix=obexftp_marshal --header > $@
+ $(AM_V_GEN) glib-genmarshal $< --prefix=obexftp_marshal --header > $@
obexftp-marshal.c: obexftp-marshal.list
- echo "#include \"obexftp-marshal.h\"" > $@ && glib-genmarshal $< --prefix=obexftp_marshal --body >> $@
+ $(AM_V_GEN) echo "#include \"obexftp-marshal.h\"" > $@ && glib-genmarshal $< --prefix=obexftp_marshal --body >> $@
endif
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index cff39e3..becf13e 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -54,7 +54,7 @@ gvfsd_metadata_SOURCES = meta-daemon.c
# D-BUS service file
%.service: %.service.in ../config.log
- sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+ $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
servicedir = $(DBUS_SERVICE_DIR)
service_in_files = gvfs-metadata.service.in
diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am
index 9b3b17c..de6d25f 100644
--- a/monitor/afc/Makefile.am
+++ b/monitor/afc/Makefile.am
@@ -38,7 +38,7 @@ service_in_files = org.gtk.Private.AfcVolumeMonitor.service.in
service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile
- @sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+ $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
clean-local:
rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA)
diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am
index a7671f0..cb64944 100644
--- a/monitor/gdu/Makefile.am
+++ b/monitor/gdu/Makefile.am
@@ -44,7 +44,7 @@ service_in_files = org.gtk.Private.GduVolumeMonitor.service.in
service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile
- @sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+ $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
clean-local:
rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA)
diff --git a/monitor/gphoto2/Makefile.am b/monitor/gphoto2/Makefile.am
index 18ab680..adb6bc1 100644
--- a/monitor/gphoto2/Makefile.am
+++ b/monitor/gphoto2/Makefile.am
@@ -11,10 +11,10 @@ BUILT_SOURCES = \
hal-marshal.h hal-marshal.c
hal-marshal.h: hal-marshal.list
- glib-genmarshal $< --prefix=hal_marshal --header > $@
+ $(AM_V_GEN) glib-genmarshal $< --prefix=hal_marshal --header > $@
hal-marshal.c: hal-marshal.list
- echo "#include \"hal-marshal.h\"" > $@ && glib-genmarshal $< --prefix=hal_marshal --body >> $@
+ $(AM_V_GEN) echo "#include \"hal-marshal.h\"" > $@ && glib-genmarshal $< --prefix=hal_marshal --body >> $@
gvfs_gphoto2_volume_monitor_SOURCES = \
hal-utils.c hal-utils.h \
@@ -73,7 +73,7 @@ service_in_files = org.gtk.Private.GPhoto2VolumeMonitor.service.in
service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile
- @sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+ $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
clean-local:
rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA)
diff --git a/monitor/hal/Makefile.am b/monitor/hal/Makefile.am
index 9c3d177..2fd3e6a 100644
--- a/monitor/hal/Makefile.am
+++ b/monitor/hal/Makefile.am
@@ -7,10 +7,10 @@ BUILT_SOURCES = \
hal-marshal.h hal-marshal.c
hal-marshal.h: hal-marshal.list
- glib-genmarshal $< --prefix=hal_marshal --header > $@
+ $(AM_V_GEN) glib-genmarshal $< --prefix=hal_marshal --header > $@
hal-marshal.c: hal-marshal.list
- echo "#include \"hal-marshal.h\"" > $@ && glib-genmarshal $< --prefix=hal_marshal --body >> $@
+ $(AM_V_GEN) echo "#include \"hal-marshal.h\"" > $@ && glib-genmarshal $< --prefix=hal_marshal --body >> $@
gvfs_hal_volume_monitor_SOURCES = \
@@ -54,7 +54,7 @@ service_in_files = org.gtk.Private.HalVolumeMonitor.service.in
service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile
- @sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
+ $(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
clean-local:
rm -f *~ *.loT $(BUILT_SOURCES) $(service_DATA)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]