Check for nm.

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)
This commit is contained in:
Matthias Clasen 2005-04-29 17:59:07 +00:00 committed by Matthias Clasen
parent 6824418b27
commit b75a8a1512
6 changed files with 20 additions and 4 deletions

View File

@ -1,5 +1,10 @@
2005-04-29 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
the internal unselect_all function, since we need the unselection the internal unselect_all function, since we need the unselection
to happen even in browse mode. (#300995, Mathias Hasselmann) to happen even in browse mode. (#300995, Mathias Hasselmann)

View File

@ -1,5 +1,10 @@
2005-04-29 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
the internal unselect_all function, since we need the unselection the internal unselect_all function, since we need the unselection
to happen even in browse mode. (#300995, Mathias Hasselmann) to happen even in browse mode. (#300995, Mathias Hasselmann)

View File

@ -1,5 +1,10 @@
2005-04-29 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
the internal unselect_all function, since we need the unselection the internal unselect_all function, since we need the unselection
to happen even in browse mode. (#300995, Mathias Hasselmann) to happen even in browse mode. (#300995, Mathias Hasselmann)

View File

@ -152,6 +152,7 @@ AM_PROG_LIBTOOL
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AM_PROG_AS AM_PROG_AS
AC_PATH_PROG(NM, nm, nm)
dnl Initialize maintainer mode dnl Initialize maintainer mode
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

View File

@ -19,8 +19,8 @@ install-libtool-import-lib:
# (Unfortunately the GNU linker doesn't yet understand the PRIVATE # (Unfortunately the GNU linker doesn't yet understand the PRIVATE
# directive in .def files.) # directive in .def files.)
for entry in `grep PRIVATE gdk_pixbuf.def | sed -e 's/PRIVATE//'`; do \ 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`; \ 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; \ $(AR) d .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $$file; \
done done
$(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) $(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib: uninstall-libtool-import-lib:

View File

@ -47,8 +47,8 @@ gtk-win32res.lo : gtk-win32.rc
install-libtool-import-lib: install-libtool-import-lib:
for entry in `grep PRIVATE gtk.def | sed -e 's/PRIVATE//'`; do \ 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`; \ 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; \ $(AR) d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \
done done
$(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) $(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib: uninstall-libtool-import-lib: