diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-01-17 21:05:38 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2010-01-17 21:57:13 +0000 |
| commit | f687777360a213c638374c1d497ca849717ce174 (patch) | |
| tree | 3a6740e80f8e240d11942c99b028838b095eed6c /extensions | |
| parent | 6a1aecd8b35cee47c56326d4babc46a146a91be0 (diff) | |
Support silent build rules with automake 1.11
Support silent build rules, requires at least automake-1.11.
Disable by either passing --disable-silent-rules to configure or
passing V=1 to make.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=585364
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Makefile.am | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 642b800d..48d55b04 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/tools/shave.mk - tools_dir = $(top_srcdir)/tools AM_CPPFLAGS = $(DISABLE_DEPRECATED) @@ -60,46 +58,46 @@ XSLTPROCFLAGS = --nonet --novalid # Generated files which can be generated for all categories simultaneously _gen/all.xml: all.xml $(wildcard *.xml) - $(mkdir_p) _gen - $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ + @$(mkdir_p) _gen + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ $< > $@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl - $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ --param "allow-undefined-interfaces" "true()" \ $(tools_dir)/doc-generator.xsl \ $< > $@ _gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \ $(top_srcdir)/tools/glib-gtypes-generator.py - $(QUIET_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ $< _gen/gtypes Emp _gen/signals-marshal.list: _gen/all.xml \ $(tools_dir)/glib-signals-marshal-gen.py - $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ _gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am - $(QUIET_GEN)$(GLIB_GENMARSHAL) --header --prefix=_emp_ext_marshal $< > $@ + $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_emp_ext_marshal $< > $@ _gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am - $(QUIET_GEN){ echo '#include "_gen/signals-marshal.h"' && \ + $(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \ $(GLIB_GENMARSHAL) --body --prefix=_emp_ext_marshal $< ; } > $@ _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \ $(tools_dir)/glib-client-marshaller-gen.py - $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ _emp_ext > $@ _gen/enums.h: _gen/all.xml \ $(tools_dir)/c-constants-gen.py - $(QUIET_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \ Emp \ $< > $@ _gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \ $(tools_dir)/glib-interfaces-gen.py - $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \ Emp _gen/interfaces-body.h _gen/interfaces.h $< # Generated files which must be generated per "category". Each TpProxy @@ -107,13 +105,13 @@ _gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \ # although you can subdivide further if you want. _gen/misc.xml: misc.xml $(wildcard *.xml) - $(mkdir_p) _gen - $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ + @$(mkdir_p) _gen + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ $< > $@ _gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml \ $(tools_dir)/glib-client-gen.py - $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ --group=misc \ --subclass=TpProxy \ --subclass-assert=TP_IS_PROXY \ @@ -123,7 +121,7 @@ _gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml \ _gen/svc-misc.c _gen/svc-misc.h: _gen/misc.xml \ $(tools_dir)/glib-ginterface-gen.py - $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ --filename=_gen/svc-misc \ --signal-marshal-prefix=_emp_ext \ --include='<telepathy-glib/dbus.h>' \ |