diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-20 11:54:52 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-20 11:54:52 +0100 |
| commit | 7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44 (patch) | |
| tree | e805e504a6e1a15159ef8f2a8976ed147e95689f /extensions | |
| parent | 4cd65645628c1b3a16cc84225833b67e9876e8ed (diff) | |
| download | telepathy-salut-7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44.tar.gz | |
Revert "Shave salut's build."
This reverts commit 99cc66bb81516ad87657e8d49e286502bba63f69.
Conflicts:
lib/gibber/Makefile.am
src/Makefile.am
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Makefile.am | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am index f18c3de7..a32ff9d7 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/tools/shave.mk - tools_dir = $(top_srcdir)/tools EXTRA_DIST = \ @@ -50,45 +48,45 @@ XSLTPROCFLAGS = --nonet --novalid _gen/%.xml: %.xml $(wildcard *.xml) $(tools_dir)/identity.xsl $(mkdir_p) _gen - $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ + $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ $< > $@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl - $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude \ + $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude \ $(tools_dir)/doc-generator.xsl \ $< > $@ _gen/signals-marshal.list: _gen/all.xml \ $(tools_dir)/glib-signals-marshal-gen.py - $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ + $(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ _gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am - $(QUIET_GEN)$(GLIB_GENMARSHAL) --header --prefix=_salut_ext_marshal $< > $@ + $(GLIB_GENMARSHAL) --header --prefix=_salut_ext_marshal $< > $@ _gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am - $(QUIET_GEN){ echo '#include "_gen/signals-marshal.h"' && \ + { echo '#include "_gen/signals-marshal.h"' && \ $(GLIB_GENMARSHAL) --body --prefix=_salut_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 $< \ + $(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ _salut_ext > $@ _gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-generator.xsl - $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ + $(XSLTPROC) $(XSLTPROCFLAGS) \ --stringparam mixed-case-prefix Salut \ $(tools_dir)/c-constants-generator.xsl \ $< > $@ _gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \ $(tools_dir)/glib-gtypes-generator.py Makefile.am - $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \ + $(PYTHON) $(tools_dir)/glib-gtypes-generator.py \ $< _gen/gtypes Salut _gen/interfaces.h: _gen/all.xml \ $(tools_dir)/glib-interfaces-generator.xsl \ $(tools_dir)/c-interfaces-generator.xsl - $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ + $(XSLTPROC) $(XSLTPROCFLAGS) \ --stringparam mixed-case-prefix Salut \ $(tools_dir)/glib-interfaces-generator.xsl \ $< > $@ @@ -96,13 +94,13 @@ _gen/interfaces.h: _gen/all.xml \ _gen/interfaces-body.h: _gen/all.xml \ $(tools_dir)/glib-interfaces-body-generator.xsl \ $(tools_dir)/c-interfaces-generator.xsl - $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \ + $(XSLTPROC) $(XSLTPROCFLAGS) \ --stringparam mixed-case-prefix Salut \ $(tools_dir)/glib-interfaces-body-generator.xsl \ $< > $@ _gen/svc.c _gen/svc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py - $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ + $(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ --filename=_gen/svc \ --signal-marshal-prefix=_salut_ext \ --include='<telepathy-glib/dbus.h>' \ |