diff --git a/ChangeLog b/ChangeLog index 9e49f4bba..4b765c5fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-12-05 Tor Lillqvist + + * glib/Makefile.am (install-libtool-import-lib): Remove the DLL + binary compatibilty entries from the import library. They aren't + used by newly compiled code, so no need to have them in the import + library. (The "PRIVATE" keyword in the .def file is supposed to do + this, but not implemented in the GNU linker yet.) + 2004-12-04 Matthias Clasen * glib/gqueue.c (g_queue_link_index): Return -1 if queue is diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9e49f4bba..4b765c5fe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-12-05 Tor Lillqvist + + * glib/Makefile.am (install-libtool-import-lib): Remove the DLL + binary compatibilty entries from the import library. They aren't + used by newly compiled code, so no need to have them in the import + library. (The "PRIVATE" keyword in the .def file is supposed to do + this, but not implemented in the GNU linker yet.) + 2004-12-04 Matthias Clasen * glib/gqueue.c (g_queue_link_index): Return -1 if queue is diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9e49f4bba..4b765c5fe 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2004-12-05 Tor Lillqvist + + * glib/Makefile.am (install-libtool-import-lib): Remove the DLL + binary compatibilty entries from the import library. They aren't + used by newly compiled code, so no need to have them in the import + library. (The "PRIVATE" keyword in the .def file is supposed to do + this, but not implemented in the GNU linker yet.) + 2004-12-04 Matthias Clasen * glib/gqueue.c (g_queue_link_index): Return -1 if queue is diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9e49f4bba..4b765c5fe 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-12-05 Tor Lillqvist + + * glib/Makefile.am (install-libtool-import-lib): Remove the DLL + binary compatibilty entries from the import library. They aren't + used by newly compiled code, so no need to have them in the import + library. (The "PRIVATE" keyword in the .def file is supposed to do + this, but not implemented in the GNU linker yet.) + 2004-12-04 Matthias Clasen * glib/gqueue.c (g_queue_link_index): Return -1 if queue is diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9e49f4bba..4b765c5fe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-12-05 Tor Lillqvist + + * glib/Makefile.am (install-libtool-import-lib): Remove the DLL + binary compatibilty entries from the import library. They aren't + used by newly compiled code, so no need to have them in the import + library. (The "PRIVATE" keyword in the .def file is supposed to do + this, but not implemented in the GNU linker yet.) + 2004-12-04 Matthias Clasen * glib/gqueue.c (g_queue_link_index): Return -1 if queue is diff --git a/glib/Makefile.am b/glib/Makefile.am index 8fb9e0604..c07dac4e7 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -196,6 +196,14 @@ if OS_WIN32 export_symbols = -export-symbols $(srcdir)/glib.def install-libtool-import-lib: +# Don't put the binary compatibility entries in the import lib! +# (Unfortunately the GNU linker doesn't yet understand the PRIVATE +# directive in .def files.) +# + for entry in `grep PRIVATE glib.def | sed -e 's/PRIVATE//'`; do \ + file=`nm -A .libs/libglib-2.0.dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \ + ar d .libs/libglib-2.0.dll.a $$file; \ + done $(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir) $(INSTALL) $(srcdir)/glib.def $(DESTDIR)$(libdir)/glib-2.0.def