[Xfce4-commits] <thunar:master> Use silent build rules if available.

Jannis Pohlmann noreply at xfce.org
Wed Oct 14 15:14:01 CEST 2009 

Updating branch refs/heads/master
         to df24eef49725794bc5f4da621da29c7a90d3573e (commit)
       from 1adf082ae5b6f6264c0c071daa7b5dd1a82a58e8 (commit)

commit df24eef49725794bc5f4da621da29c7a90d3573e
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Wed Oct 14 15:11:54 2009 +0200

    Use silent build rules if available.

 Makefile.am                    |   28 +++++++++-------
 configure.in.in                |    1 +
 plugins/thunar-tpa/Makefile.am |    2 +-
 thunar/Makefile.am             |   71 ++++++++++++++++++++++------------------
 4 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 433a174..ce0a42a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,18 +24,22 @@ libexec_SCRIPTS =							\
 	ThunarHelp
 
 ThunarBulkRename: ThunarBulkRename.in Makefile
-	rm -f ThunarBulkRename.gen ThunarBulkRename
-	sed -e "s,\@bindir\@,$(bindir),g" 				\
-		< $(srcdir)/ThunarBulkRename.in				\
-		> ThunarBulkRename.gen
-	mv ThunarBulkRename.gen ThunarBulkRename
+	$(AM_V_GEN) (							\
+		rm -f ThunarBulkRename.gen ThunarBulkRename		\
+		&& sed -e "s,\@bindir\@,$(bindir),g" 			\
+			< $(srcdir)/ThunarBulkRename.in			\
+			> ThunarBulkRename.gen				\
+		&& mv ThunarBulkRename.gen ThunarBulkRename 		\
+	)
 
 ThunarHelp: ThunarHelp.in Makefile
-	rm -f ThunarHelp.gen ThunarHelp
-	sed -e "s,\@datadir\@,$(datadir),g" 				\
-		< $(srcdir)/ThunarHelp.in				\
-		> ThunarHelp.gen
-	mv ThunarHelp.gen ThunarHelp
+	$(AM_V_GEN) (							\
+		rm -f ThunarHelp.gen ThunarHelp				\
+		&& sed -e "s,\@datadir\@,$(datadir),g" 			\
+			< $(srcdir)/ThunarHelp.in			\
+			> ThunarHelp.gen				\
+		&& mv ThunarHelp.gen ThunarHelp				\
+	)
 
 desktopdir = $(datadir)/applications
 desktop_in_in_files = 							\
@@ -44,7 +48,7 @@ desktop_in_in_files = 							\
 	Thunar-folder-handler.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 %.desktop.in: %.desktop.in.in
-	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+	$(AM_V_GEN) sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
@@ -53,7 +57,7 @@ servicedir = $(datadir)/dbus-1/services
 service_in_files = org.xfce.FileManager.service.in org.xfce.Thunar.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 %.service: %.service.in
-	sed -e "s,\@bindir\@,$(bindir),g" < $< > $@
+	$(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" < $< > $@
 endif
 
 EXTRA_DIST =								\
diff --git a/configure.in.in b/configure.in.in
index 4cc3236..a591e41 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -51,6 +51,7 @@ dnl ***************************
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl *******************************
 dnl *** Check for UNIX variants ***
diff --git a/plugins/thunar-tpa/Makefile.am b/plugins/thunar-tpa/Makefile.am
index 19cbe84..324823d 100644
--- a/plugins/thunar-tpa/Makefile.am
+++ b/plugins/thunar-tpa/Makefile.am
@@ -39,7 +39,7 @@ DISTCLEANFILES =							\
 	thunar-tpa-bindings.h
 
 thunar-tpa-bindings.h: $(srcdir)/thunar-tpa-bindings.xml Makefile
-	dbus-binding-tool --prefix=thunar_tpa_dbus --mode=glib-client $(srcdir)/thunar-tpa-bindings.xml > thunar-tpa-bindings.h
+	$(AM_V_GEN) dbus-binding-tool --prefix=thunar_tpa_dbus --mode=glib-client $(srcdir)/thunar-tpa-bindings.xml > thunar-tpa-bindings.h
 endif
 
 desktopdir = $(datadir)/xfce4/panel-plugins
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 281bf6b..4f606b7 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -325,67 +325,74 @@ BUILT_SOURCES =								\
 
 if HAVE_DBUS
 thunar-dbus-service-infos.h: $(srcdir)/thunar-dbus-service-infos.xml Makefile
-	dbus-binding-tool --prefix=thunar_dbus_service --mode=glib-server $(srcdir)/thunar-dbus-service-infos.xml > thunar-dbus-service-infos.h
+	$(AM_V_GEN) dbus-binding-tool --prefix=thunar_dbus_service --mode=glib-server $(srcdir)/thunar-dbus-service-infos.xml > thunar-dbus-service-infos.h
 
 thunar-thumbnailer-proxy.h: $(srcdir)/thunar-thumbnailer-dbus.xml Makefile
-	dbus-binding-tool --mode=glib-client \
-		$(srcdir)/thunar-thumbnailer-dbus.xml > thunar-thumbnailer-proxy.h \
-	&& sed -i -e 's/org_freedesktop_thumbnails_Thumbnailer1/thunar_thumbnailer_proxy/g' \
-		thunar-thumbnailer-proxy.h
+	$(AM_V_GEN) ( \
+		dbus-binding-tool --mode=glib-client \
+			$(srcdir)/thunar-thumbnailer-dbus.xml > thunar-thumbnailer-proxy.h \
+		&& sed -i -e 's/org_freedesktop_thumbnails_Thumbnailer1/thunar_thumbnailer_proxy/g' \
+			thunar-thumbnailer-proxy.h \
+	)
 endif
 
 thunar-throbber-fallback.c: $(srcdir)/thunar-throbber-fallback.png Makefile
-	(echo "#include <thunar/thunar-throbber-fallback.h>" && gdk-pixbuf-csource --extern --raw --stream --name=thunar_throbber_fallback $(srcdir)/thunar-throbber-fallback.png) > thunar-throbber-fallback.c
+	$(AM_V_GEN) (echo "#include <thunar/thunar-throbber-fallback.h>" && gdk-pixbuf-csource --extern --raw --stream --name=thunar_throbber_fallback $(srcdir)/thunar-throbber-fallback.png) > thunar-throbber-fallback.c
 
 thunar-thumbnail-frame.c: $(srcdir)/thunar-thumbnail-frame.png Makefile
-	(echo "#include <thunar/thunar-thumbnail-frame.h>" && gdk-pixbuf-csource --extern --raw --stream --name=thunar_thumbnail_frame $(srcdir)/thunar-thumbnail-frame.png) > thunar-thumbnail-frame.c
+	$(AM_V_GEN) (echo "#include <thunar/thunar-thumbnail-frame.h>" && gdk-pixbuf-csource --extern --raw --stream --name=thunar_thumbnail_frame $(srcdir)/thunar-thumbnail-frame.png) > thunar-thumbnail-frame.c
 
 thunar-abstract-icon-view-ui.h: Makefile $(srcdir)/thunar-abstract-icon-view-ui.xml
-	exo-csource --strip-comments --strip-content --static --name=thunar_abstract_icon_view_ui $(srcdir)/thunar-abstract-icon-view-ui.xml > thunar-abstract-icon-view-ui.h
+	$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=thunar_abstract_icon_view_ui $(srcdir)/thunar-abstract-icon-view-ui.xml > thunar-abstract-icon-view-ui.h
 
 thunar-details-view-ui.h: Makefile $(srcdir)/thunar-details-view-ui.xml
-	exo-csource --strip-comments --strip-content --static --name=thunar_details_view_ui $(srcdir)/thunar-details-view-ui.xml > thunar-details-view-ui.h
+	$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=thunar_details_view_ui $(srcdir)/thunar-details-view-ui.xml > thunar-details-view-ui.h
 
 thunar-launcher-ui.h: Makefile $(srcdir)/thunar-launcher-ui.xml
-	exo-csource --strip-comments --strip-content --static --name=thunar_launcher_ui $(srcdir)/thunar-launcher-ui.xml > thunar-launcher-ui.h
+	$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=thunar_launcher_ui $(srcdir)/thunar-launcher-ui.xml > thunar-launcher-ui.h
 
 thunar-location-buttons-ui.h: Makefile $(srcdir)/thunar-location-buttons-ui.xml
-	exo-csource --strip-comments --strip-content --static --name=thunar_location_buttons_ui $(srcdir)/thunar-location-buttons-ui.xml > thunar-location-buttons-ui.h
+	$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=thunar_location_buttons_ui $(srcdir)/thunar-location-buttons-ui.xml > thunar-location-buttons-ui.h
 
 thunar-shortcuts-pane-ui.h: Makefile $(srcdir)/thunar-shortcuts-pane-ui.xml
-	exo-csource --strip-comments --strip-content --static --name=thunar_shortcuts_pane_ui $(srcdir)/thunar-shortcuts-pane-ui.xml > thunar-shortcuts-pane-ui.h
+	$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=thunar_shortcuts_pane_ui $(srcdir)/thunar-shortcuts-pane-ui.xml > thunar-shortcuts-pane-ui.h
 
 thunar-renamer-dialog-ui.h: Makefile $(srcdir)/thunar-renamer-dialog-ui.xml
-	exo-csource --strip-comments --strip-content --static --name=thunar_renamer_dialog_ui $(srcdir)/thunar-renamer-dialog-ui.xml > thunar-renamer-dialog-ui.h
+	$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=thunar_renamer_dialog_ui $(srcdir)/thunar-renamer-dialog-ui.xml > thunar-renamer-dialog-ui.h
 
 thunar-standard-view-ui.h: Makefile $(srcdir)/thunar-standard-view-ui.xml
-	exo-csource --strip-comments --strip-content --static --name=thunar_standard_view_ui $(srcdir)/thunar-standard-view-ui.xml > thunar-standard-view-ui.h
+	$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=thunar_standard_view_ui $(srcdir)/thunar-standard-view-ui.xml > thunar-standard-view-ui.h
 
 thunar-window-ui.h: Makefile $(srcdir)/thunar-window-ui.xml
-	exo-csource --strip-comments --strip-content --static --name=thunar_window_ui $(srcdir)/thunar-window-ui.xml > thunar-window-ui.h
+	$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=thunar_window_ui $(srcdir)/thunar-window-ui.xml > thunar-window-ui.h
 
 thunar-marshal.h: stamp-thunar-marshal.h
 	@true
+
 stamp-thunar-marshal.h: thunar-marshal.list Makefile
-	cd $(srcdir) \
-	&& echo "#ifndef __THUNAR_MARSHAL_H__" > xgen-tmh \
-	&& echo "#define __THUNAR_MARSHAL_H__" >> xgen-tmh \
-	&& ( glib-genmarshal \
-		--prefix=_thunar_marshal \
-		--header thunar-marshal.list ) >> xgen-tmh \
-	&& echo "#endif /* !__THUNAR_MARSHAL_H__ */" >> xgen-tmh \
-	&& ( cmp -s xgen-tmh thunar-marshal.h || cp xgen-tmh thunar-marshal.h ) \
-	&& rm -f xgen-tmh \
-	&& echo timestamp > $(@F)
+	$(AM_V_GEN) ( \
+		cd $(srcdir) \
+		&& echo "#ifndef __THUNAR_MARSHAL_H__" > xgen-tmh \
+		&& echo "#define __THUNAR_MARSHAL_H__" >> xgen-tmh \
+		&& ( glib-genmarshal \
+			--prefix=_thunar_marshal \
+			--header thunar-marshal.list ) >> xgen-tmh \
+		&& echo "#endif /* !__THUNAR_MARSHAL_H__ */" >> xgen-tmh \
+		&& ( cmp -s xgen-tmh thunar-marshal.h || cp xgen-tmh thunar-marshal.h ) \
+		&& rm -f xgen-tmh \
+		&& echo timestamp > $(@F) \
+	)
 
 thunar-marshal.c: thunar-marshal.list Makefile
-	cd $(srcdir) \
-	&& echo "#include <thunar/thunar-marshal.h>" > xgen-tmc \
-	&& ( glib-genmarshal \
-		--prefix=_thunar_marshal \
-		--body thunar-marshal.list ) >> xgen-tmc \
-	&& cp xgen-tmc thunar-marshal.c \
-	&& rm -f xgen-tmc
+	$(AM_V_GEN) ( \
+		cd $(srcdir) \
+		&& echo "#include <thunar/thunar-marshal.h>" > xgen-tmc \
+		&& ( glib-genmarshal \
+			--prefix=_thunar_marshal \
+			--body thunar-marshal.list ) >> xgen-tmc \
+		&& cp xgen-tmc thunar-marshal.c \
+		&& rm -f xgen-tmc \
+	)
 endif
 
 EXTRA_DIST =								\

More information about the Xfce4-commits mailing list