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
This commit is contained in:
Tor Lillqvist 2008-03-20 16:21:49 +00:00 committed by Tor Lillqvist
parent a49e02362f
commit 84fa2c6194
2 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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