From 84fa2c6194c90ddaa05c353ab75fe89750f47677 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Thu, 20 Mar 2008 16:21:49 +0000
Subject: [PATCH] Revert accidental change that went in as part of the commit
 on 2008-03-18.

2008-03-20  Tor Lillqvist  <tml@novell.com>

	* gtk/Makefile.am: Revert accidental change that went in as part
	of the commit on 2008-03-18. Do use grep -o. Unbreaks build on
	Darwin.


svn path=/trunk/; revision=19913
---
 ChangeLog       | 6 ++++++
 gtk/Makefile.am | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 855c6c1360..6948047db8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-20  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/Makefile.am: Revert accidental change that went in as part
+	of the commit on 2008-03-18. Do use grep -o. Unbreaks build on
+	Darwin.
+
 2008-03-20  Tor Lillqvist  <tml@novell.com>
 
 	* tests/testfilechooserbutton.c (chooser_update_preview_cb): Don't
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index ee48eae742..c20b2b0b15 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -847,8 +847,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
 	echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
 	  ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
-	  egrep '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | \
-	  sed -e 's/.*\(\<g[td]k_[a-zA-Z0-9_]\+_get_type\>\).*/\1/' | \
+	  grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
 	  sort | uniq | \
 	  sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
 	&& cp xgen-gtf $@ && rm -f xgen-gtf