gtk+ r19913 - in trunk: . gtk

[tml svn gnome org]

Author: tml
Date: Thu Mar 20 16:21:49 2008
New Revision: 19913
URL: http://svn.gnome.org/viewvc/gtk+?rev=19913&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/Makefile.am

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Thu Mar 20 16:21:49 2008
@@ -847,8 +847,7 @@
 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