Updating branch refs/heads/master
to a906368b5ba730bc4ce27485e71183234ac1bdb1 (commit)
from 58f692877c4b6bb5e0f25039ea260652ebacc936 (commit)
commit a906368b5ba730bc4ce27485e71183234ac1bdb1
Author: Nick Schermer <n...@xfce.org>
Date: Thu Jan 28 22:14:38 2010 +0100
Put $(AM_V_GEN) in the Makefiles.
engines/mice/Makefile.am | 4 ++--
engines/simple/Makefile.am | 4 ++--
panel-plugin/Makefile.am | 2 +-
settings/Makefile.am | 12 ++++++------
xfce4-session/Makefile.am | 10 +++++-----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/engines/mice/Makefile.am b/engines/mice/Makefile.am
index b856c31..9363ddb 100644
--- a/engines/mice/Makefile.am
+++ b/engines/mice/Makefile.am
@@ -44,10 +44,10 @@ BUILT_SOURCES =
\
preview.h
preview.h: $(srcdir)/preview.png
- gdk-pixbuf-csource --static --raw --stream --name=preview $< > $@
+ $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=preview
$< > $@
slide.h: $(srcdir)/slide.png
- gdk-pixbuf-csource --static --raw --stream --name=slide $< > $@
+ $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=slide $<
> $@
DISTCLEANFILES = \
$(BUILT_SOURCES)
diff --git a/engines/simple/Makefile.am b/engines/simple/Makefile.am
index c63d7ea..ca5d0f5 100644
--- a/engines/simple/Makefile.am
+++ b/engines/simple/Makefile.am
@@ -35,10 +35,10 @@ BUILT_SOURCES =
\
preview.h
fallback.h: $(srcdir)/fallback.png
- gdk-pixbuf-csource --static --raw --stream --name=fallback $< > $@
+ $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=fallback
$< > $@
preview.h: $(srcdir)/preview.png
- gdk-pixbuf-csource --static --raw --stream --name=preview $< > $@
+ $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=preview
$< > $@
DISTCLEANFILES = \
$(BUILT_SOURCES)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index bd04430..5bbbb4b 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -71,7 +71,7 @@ xfsm-logout-plugin.desktop.in: $(srcdir)/$(dfile)
if MAINTAINER_MODE
xfsm-logout-plugin-ui.h: $(srcdir)/xfsm-logout-plugin-ui.xml Makefile
- exo-csource --static --name=logout_plugin_ui $< > $@
+ $(AM_V_GEN) exo-csource --static --name=logout_plugin_ui $< > $@
BUILT_SOURCES = xfsm-logout-plugin-ui.h
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 87a4847..ecf6eed 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -62,25 +62,25 @@ BUILT_SOURCES = \
nopreview.h
nopreview.h: $(srcdir)/nopreview.png
- gdk-pixbuf-csource --static --raw --stream --name=nopreview $< > $@
+ $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream --name=nopreview
$< > $@
xfce4-session-marshal.h: stamp-xfce4-session-marshal.h
@true
stamp-xfce4-session-marshal.h: xfce4-session-marshal.list Makefile
- glib-genmarshal --prefix=xfce4_session_marshal
xfce4-session-marshal.list --header > xfce4-session-marshal.h
+ $(AM_V_GEN) glib-genmarshal --prefix=xfce4_session_marshal
xfce4-session-marshal.list --header > xfce4-session-marshal.h
echo timestamp > $(@F)
xfce4-session-marshal.c: xfce4-session-marshal.list Makefile
- echo '#include "xfce4-session-marshal.h"' > $@
+ $(AM_V_GEN) echo '#include "xfce4-session-marshal.h"' > $@
glib-genmarshal --prefix=xfce4_session_marshal
xfce4-session-marshal.list --body >> xfce4-session-marshal.c
xfce4-session-settings_ui.h: xfce4-session-settings.glade
- exo-csource --static --strip-comments --strip-content
--name=xfce4_session_settings_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content
--name=xfce4_session_settings_ui $< >$@
xfsm-client-dbus-client.h: $(top_srcdir)/xfce4-session/xfsm-client-dbus.xml
Makefile
- dbus-binding-tool --mode=glib-client
$(top_srcdir)/xfce4-session/xfsm-client-dbus.xml > $@
+ $(AM_V_GEN) dbus-binding-tool --mode=glib-client
$(top_srcdir)/xfce4-session/xfsm-client-dbus.xml > $@
xfsm-manager-dbus-client.h: $(top_srcdir)/xfce4-session/xfsm-manager-dbus.xml
Makefile
- dbus-binding-tool --mode=glib-client
$(top_srcdir)/xfce4-session/xfsm-manager-dbus.xml > $@
+ $(AM_V_GEN) dbus-binding-tool --mode=glib-client
$(top_srcdir)/xfce4-session/xfsm-manager-dbus.xml > $@
endif
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index ca498c0..d8416a2 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -95,22 +95,22 @@ BUILT_SOURCES =
\
chooser-icon.h
chooser-icon.h: $(srcdir)/chooser-icon.png
- gdk-pixbuf-csource --static --raw --stream --name=chooser_icon_data $<
> $@
+ $(AM_V_GEN) gdk-pixbuf-csource --static --raw --stream
--name=chooser_icon_data $< > $@
xfsm-marshal.h: stamp-xfsm-marshal.h
@true
stamp-xfsm-marshal.h: xfsm-marshal.list Makefile
- glib-genmarshal --prefix=xfsm_marshal xfsm-marshal.list --header >
xfsm-marshal.h
+ $(AM_V_GEN) glib-genmarshal --prefix=xfsm_marshal xfsm-marshal.list
--header > xfsm-marshal.h
echo timestamp > $(@F)
xfsm-marshal.c: xfsm-marshal.list Makefile
- echo '#include "xfsm-marshal.h"' > $@
+ $(AM_V_GEN) echo '#include "xfsm-marshal.h"' > $@
glib-genmarshal --prefix=xfsm_marshal xfsm-marshal.list --body >>
xfsm-marshal.c
xfsm-manager-dbus.h: $(srcdir)/xfsm-manager-dbus.xml
- dbus-binding-tool --mode=glib-server --prefix=xfsm_manager $< > $@
+ $(AM_V_GEN) dbus-binding-tool --mode=glib-server --prefix=xfsm_manager
$< > $@
xfsm-client-dbus.h: $(srcdir)/xfsm-client-dbus.xml
- dbus-binding-tool --mode=glib-server --prefix=xfsm_client $< > $@
+ $(AM_V_GEN) dbus-binding-tool --mode=glib-server --prefix=xfsm_client
$< > $@
DISTCLEANFILES =
\
$(BUILT_SOURCES)
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
