diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/Makefile.am | 4 |
6 files changed, 20 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2005-04-29 Matthias Clasen <mclasen@redhat.com> + * configure.in: Check for nm. + + * gtk/Makefile.am: Use $(NM), not nm directly. (#301299, + Nguyen Thai Ngoc Duy) + * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use the internal unselect_all function, since we need the unselection to happen even in browse mode. (#300995, Mathias Hasselmann) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 86c1443e6..3db85f626 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2005-04-29 Matthias Clasen <mclasen@redhat.com> + * configure.in: Check for nm. + + * gtk/Makefile.am: Use $(NM), not nm directly. (#301299, + Nguyen Thai Ngoc Duy) + * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use the internal unselect_all function, since we need the unselection to happen even in browse mode. (#300995, Mathias Hasselmann) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 86c1443e6..3db85f626 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2005-04-29 Matthias Clasen <mclasen@redhat.com> + * configure.in: Check for nm. + + * gtk/Makefile.am: Use $(NM), not nm directly. (#301299, + Nguyen Thai Ngoc Duy) + * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use the internal unselect_all function, since we need the unselection to happen even in browse mode. (#300995, Mathias Hasselmann) diff --git a/configure.in b/configure.in index 69ab1860a..fb613fe07 100644 --- a/configure.in +++ b/configure.in @@ -152,6 +152,7 @@ AM_PROG_LIBTOOL AC_SYS_LARGEFILE AM_PROG_AS +AC_PATH_PROG(NM, nm, nm) dnl Initialize maintainer mode AM_MAINTAINER_MODE diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 9837974c9..3dccc1d2f 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -19,8 +19,8 @@ install-libtool-import-lib: # (Unfortunately the GNU linker doesn't yet understand the PRIVATE # directive in .def files.) for entry in `grep PRIVATE gdk_pixbuf.def | sed -e 's/PRIVATE//'`; do \ - file=`nm -A .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \ - ar d .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $$file; \ + file=`$(NM) -A .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \ + $(AR) d .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $$file; \ done $(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: diff --git a/gtk/Makefile.am b/gtk/Makefile.am index a509c247a..3110424f8 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -47,8 +47,8 @@ gtk-win32res.lo : gtk-win32.rc install-libtool-import-lib: for entry in `grep PRIVATE gtk.def | sed -e 's/PRIVATE//'`; do \ - file=`nm -A .libs/libgtk-win32-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \ - ar d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \ + file=`$(NM) -A .libs/libgtk-win32-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \ + $(AR) d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \ done $(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: |