From 7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 20 May 2010 11:54:52 +0100
Subject: Revert "Shave salut's build."

This reverts commit 99cc66bb81516ad87657e8d49e286502bba63f69.

Conflicts:

	lib/gibber/Makefile.am
	src/Makefile.am
---
 tools/Makefile.am | 14 ++++++--------
 tools/shave.mk    |  1 -
 2 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 tools/shave.mk

(limited to 'tools')

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   '$@;)
-- 
cgit v1.2.1