summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-20 11:54:52 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-20 11:54:52 +0100
commit7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44 (patch)
treee805e504a6e1a15159ef8f2a8976ed147e95689f /tools
parent4cd65645628c1b3a16cc84225833b67e9876e8ed (diff)
downloadtelepathy-salut-7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44.tar.gz
Revert "Shave salut's build."
This reverts commit 99cc66bb81516ad87657e8d49e286502bba63f69. Conflicts: lib/gibber/Makefile.am src/Makefile.am
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am14
-rw-r--r--tools/shave.mk1
2 files changed, 6 insertions, 9 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ba46cda9..1ebea7ef 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
EXTRA_DIST = \
c-constants-generator.xsl \
c-interfaces-generator.xsl \
@@ -21,18 +19,18 @@ EXTRA_DIST = \
xep.xsl
glib-client-marshaller-gen.py: libglibcodegen.py
- $(QUIET_GEN)touch $@
+ touch $@
glib-ginterface-gen.py: libglibcodegen.py
- $(QUIET_GEN)touch $@
+ touch $@
glib-gtypes-generator.py: libglibcodegen.py
- $(QUIET_GEN)touch $@
+ touch $@
glib-signals-marshal-gen.py: libglibcodegen.py
- $(QUIET_GEN)touch $@
+ touch $@
glib-interfaces-generator.xsl: c-interfaces-generator.xsl
- $(QUIET_GEN)touch $@
+ touch $@
glib-interfaces-body-generator.xsl: c-interfaces-generator.xsl
- $(QUIET_GEN)touch $@
+ touch $@
maintainer-update-from-xmpp.org:
set -e; \
diff --git a/tools/shave.mk b/tools/shave.mk
deleted file mode 100644
index 53cb3bf5..00000000
--- a/tools/shave.mk
+++ /dev/null
@@ -1 +0,0 @@
-QUIET_GEN = $(Q:@=@echo ' GEN '$@;)