Merge commit 'bari/marshalList'

svn path=/trunk/; revision=651

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index f5321517059f61674ad48929e5cdbfad33a07575..fc0396615b14d3a6b25ef86bbf3fd163ebade98a 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -142,7 +142,7 @@ glade_DATA =                                        \
 
 empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
        ( cd $(srcdir) && \
-       sed -n -e 's/.*empathy_gtk_marshal_\([[:upper:]]*__[[:upper:]_]*\).*/\1/p' \
+       sed -n -e 's/.*empathy_gtk_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
        $(libempathy_gtk_la_SOURCES) ) \
        | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
        if cmp -s $@.tmp $@; then \

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index b952be270ee0137a816ff633de18407326909e23..90b3aa891c8fa3cefee2e8be5d224dd5c113bcdd 100644 (file)
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -93,7 +93,7 @@ libempathy_include_HEADERS =                  \
 
 empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am
        ( cd $(srcdir) && \
-       sed -n -e 's/.*empathy_marshal_\([[:upper:]]*__[[:upper:]_]*\).*/\1/p' \
+       sed -n -e 's/.*empathy_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
        $(libempathy_la_SOURCES) ) \
        | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
        if cmp -s $@.tmp $@; then \