Improve portability. The -o option is present only in newish GNU egreps.

2007-11-28  Tor Lillqvist  <tml@novell.com>

	* gtk/Makefile.am: Improve portability. The -o option is present
	only in newish GNU egreps. Use one more sed in the pipeline
	instead.

svn path=/trunk/; revision=19082

diff --git a/ChangeLog b/ChangeLog
index 12f8d335a7a1b0a6b85f93f606c798fbf15af88c..7c141eb9daeab43cbda9bf566b5b7303705852ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-28  Tor Lillqvist  <tml@novell.com>
+
+       * gtk/Makefile.am: Improve portability. The -o option is present
+       only in newish GNU egreps. Use one more sed in the pipeline
+       instead.
+

 2007-11-28  Tor Lillqvist  <tml@novell.com>
 
        Fix #375893, patch by Ben Hague:
 2007-11-28  Tor Lillqvist  <tml@novell.com>
 
        Fix #375893, patch by Ben Hague:

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 33b7695bbe1f1b5f1a07cb8bb803ca7e6065b2e9..91b712984af4e04aee9bc9ed70d695dde111b613 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -814,7 +814,9 @@ 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 | \
 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 -o '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | sort | uniq | \
+         egrep '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | \
+         sed -e 's/.*\(\<g[td]k_[a-zA-Z0-9_]\+_get_type\>\).*/\1/' | \
+         sort | uniq | \

          sed '{ s/^/vgt=/; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
          sed '{ s/^/vgt=/; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c