From a44c1da1c4a96e0cf4fcfd8e1cc1fff6323cf8ca Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 13 Aug 2003 00:24:21 +0000 Subject: [PATCH] glib/Makefile.am gmodule/Makefile.am gobject/Makefile.am Use srcdir also 2003-08-13 Tor Lillqvist * glib/Makefile.am * gmodule/Makefile.am * gobject/Makefile.am * gthread/Makefile.am: Use srcdir also in references to the .def files. (#118885, Jeff Bonggren) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ glib/Makefile.am | 4 ++-- gmodule/Makefile.am | 4 ++-- gobject/Makefile.am | 4 ++-- gthread/Makefile.am | 4 ++-- 10 files changed, 56 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d99520944..83984b69e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-08-13 Tor Lillqvist + + * glib/Makefile.am + * gmodule/Makefile.am + * gobject/Makefile.am + * gthread/Makefile.am: Use srcdir also in references to the .def + files. (#118885, Jeff Bonggren) + 2003-08-12 Tor Lillqvist * glib/gconvert.c (g_locale_from_utf8): Drop the Win32-specific diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d99520944..83984b69e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2003-08-13 Tor Lillqvist + + * glib/Makefile.am + * gmodule/Makefile.am + * gobject/Makefile.am + * gthread/Makefile.am: Use srcdir also in references to the .def + files. (#118885, Jeff Bonggren) + 2003-08-12 Tor Lillqvist * glib/gconvert.c (g_locale_from_utf8): Drop the Win32-specific diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index d99520944..83984b69e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2003-08-13 Tor Lillqvist + + * glib/Makefile.am + * gmodule/Makefile.am + * gobject/Makefile.am + * gthread/Makefile.am: Use srcdir also in references to the .def + files. (#118885, Jeff Bonggren) + 2003-08-12 Tor Lillqvist * glib/gconvert.c (g_locale_from_utf8): Drop the Win32-specific diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d99520944..83984b69e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2003-08-13 Tor Lillqvist + + * glib/Makefile.am + * gmodule/Makefile.am + * gobject/Makefile.am + * gthread/Makefile.am: Use srcdir also in references to the .def + files. (#118885, Jeff Bonggren) + 2003-08-12 Tor Lillqvist * glib/gconvert.c (g_locale_from_utf8): Drop the Win32-specific diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d99520944..83984b69e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2003-08-13 Tor Lillqvist + + * glib/Makefile.am + * gmodule/Makefile.am + * gobject/Makefile.am + * gthread/Makefile.am: Use srcdir also in references to the .def + files. (#118885, Jeff Bonggren) + 2003-08-12 Tor Lillqvist * glib/gconvert.c (g_locale_from_utf8): Drop the Win32-specific diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d99520944..83984b69e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2003-08-13 Tor Lillqvist + + * glib/Makefile.am + * gmodule/Makefile.am + * gobject/Makefile.am + * gthread/Makefile.am: Use srcdir also in references to the .def + files. (#118885, Jeff Bonggren) + 2003-08-12 Tor Lillqvist * glib/gconvert.c (g_locale_from_utf8): Drop the Win32-specific diff --git a/glib/Makefile.am b/glib/Makefile.am index b6b390654..2f3a007ad 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -169,11 +169,11 @@ endif if OS_WIN32 # This requires a very new libtool -export_symbols = -export-symbols glib.def +export_symbols = -export-symbols $(srcdir)/glib.def install-libtool-import-lib: $(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir) - $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def + $(INSTALL) $(srcdir)/glib.def $(DESTDIR)$(libdir)/glib-2.0.def uninstall-libtool-import-lib: -rm $(DESTDIR)$(libdir)/libglib-2.0.dll.a $(DESTDIR)$(libdir)/glib-2.0.def diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index ad70c70ed..4f7c7b52f 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -53,11 +53,11 @@ no_undefined = -no-undefined endif if OS_WIN32 -export_symbols = -export-symbols gmodule.def +export_symbols = -export-symbols $(srcdir)/gmodule.def install-libtool-import-lib: $(INSTALL) .libs/libgmodule-2.0.dll.a $(DESTDIR)$(libdir) - $(INSTALL) gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def + $(INSTALL) $(srcdir)/gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def uninstall-libtool-import-lib: -rm $(DESTDIR)$(libdir)/libgmodule-2.0.dll.a $(DESTDIR)$(libdir)/gmodule-2.0.def diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 20e78b580..3f299c41d 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -36,11 +36,11 @@ no_undefined = -no-undefined endif if OS_WIN32 -export_symbols = -export-symbols gobject.def +export_symbols = -export-symbols $(srcdir)/gobject.def install-libtool-import-lib: $(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir) - $(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def + $(INSTALL) $(srcdir)/gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def uninstall-libtool-import-lib: -rm $(DESTDIR)$(libdir)/libgobject-2.0.dll.a $(DESTDIR)$(libdir)/gobject-2.0.def diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 66da12f4f..b633a958a 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -43,11 +43,11 @@ no_undefined = -no-undefined endif if OS_WIN32 -export_symbols = -export-symbols gthread.def +export_symbols = -export-symbols $(srcdir)/gthread.def install-libtool-import-lib: $(INSTALL) .libs/libgthread-2.0.dll.a $(DESTDIR)$(libdir) - $(INSTALL) gthread.def $(DESTDIR)$(libdir)/gthread-2.0.def + $(INSTALL) $(srcdir)/gthread.def $(DESTDIR)$(libdir)/gthread-2.0.def uninstall-libtool-import-lib: -rm $(DESTDIR)$(libdir)/libgthread-2.0.dll.a $(DESTDIR)$(libdir)/gthread-2.0.def