diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-18 18:00:05 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-02-18 18:00:05 +0800 |
| commit | 33207a87645bf45e9ead5d16dbd94715420882b3 (patch) | |
| tree | b5790e89bb4794fb0624c054e07652268e74dfbd | |
| parent | 3536ae5d77fbd36458956536134a39d3c59de5fc (diff) | |
| download | gsoc2013-empathy-33207a87645bf45e9ead5d16dbd94715420882b3.tar gsoc2013-empathy-33207a87645bf45e9ead5d16dbd94715420882b3.tar.gz gsoc2013-empathy-33207a87645bf45e9ead5d16dbd94715420882b3.tar.bz2 gsoc2013-empathy-33207a87645bf45e9ead5d16dbd94715420882b3.tar.lz gsoc2013-empathy-33207a87645bf45e9ead5d16dbd94715420882b3.tar.xz gsoc2013-empathy-33207a87645bf45e9ead5d16dbd94715420882b3.tar.zst gsoc2013-empathy-33207a87645bf45e9ead5d16dbd94715420882b3.zip | |
Merge commit 'bari/marshalList'
svn path=/trunk/; revision=651
| -rw-r--r-- | libempathy-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index f53215170..fc0396615 100644 --- 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 b952be270..90b3aa891 100644 --- 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 \ |