diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 384875796..85da18502 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,9 @@ +2005-06-26 Tor Lillqvist + + * Makefile.am: libtool installs/uninstalls the import library, no + need to do it ourselves. Do still install/uninstall the .def file, + though. + 2005-06-24 Tor Lillqvist * Makefile.am (install-libtool-import-lib): Current GNU tools do diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 58fffda8c..0c9cbbd90 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -54,15 +54,14 @@ endif if OS_WIN32 export_symbols = -export-symbols $(srcdir)/gmodule.def -install-libtool-import-lib: - $(INSTALL) .libs/libgmodule-2.0.dll.a $(DESTDIR)$(libdir) +install-def-file: $(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 +uninstall-def-file: + -rm $(DESTDIR)$(libdir)/gmodule-2.0.def else -install-libtool-import-lib: -uninstall-libtool-import-lib: +install-def-file: +uninstall-def-file: endif libgmodule_2_0_la_SOURCES = gmodule.c @@ -100,6 +99,6 @@ dist-hook: $(BUILT_EXTRA_DIST) cp $$d/$$f $(distdir) || exit 1; done -install-data-local: install-ms-lib install-libtool-import-lib +install-data-local: install-ms-lib install-def-file -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib +uninstall-local: uninstall-ms-lib uninstall-def-file diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 702bcfbe8..5cc616d32 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,9 @@ +2005-06-26 Tor Lillqvist + + * Makefile.am: libtool installs/uninstalls the import library, no + need to do it ourselves. Do still install/uninstall the .def file, + though. + 2005-06-24 Tor Lillqvist * Makefile.am (install-libtool-import-lib): Current GNU tools do diff --git a/gobject/Makefile.am b/gobject/Makefile.am index eb636fd5b..d758a03f9 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -53,15 +53,14 @@ endif if OS_WIN32 export_symbols = -export-symbols gobject.def -install-libtool-import-lib: - $(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir) +install-def-file: $(INSTALL) 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 +uninstall-def-file: + -rm $(DESTDIR)$(libdir)/gobject-2.0.def else -install-libtool-import-lib: -uninstall-libtool-import-lib: +install-def-file: +uninstall-def-file: export_symbols = $(LIBTOOL_EXPORT_OPTIONS) endif @@ -244,9 +243,9 @@ dist-hook: $(BUILT_EXTRA_DIST) if test -f $$f; then d=.; else d=$(srcdir); fi; \ cp $$d/$$f $(distdir) || exit 1; done -install-data-local: install-ms-lib install-libtool-import-lib +install-data-local: install-ms-lib install-def-file -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib +uninstall-local: uninstall-ms-lib uninstall-def-file distclean-local: if test $(srcdir) = .; then :; else \ diff --git a/gthread/ChangeLog b/gthread/ChangeLog index d13d6acb0..7f43fc5fa 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,9 @@ +2005-06-26 Tor Lillqvist + + * Makefile.am: libtool installs/uninstalls the import library, no + need to do it ourselves. Do still install/uninstall the .def file, + though. + 2005-06-10 Matthias Clasen * === Released 2.7.0 === diff --git a/gthread/Makefile.am b/gthread/Makefile.am index a6d7b6e52..7f39f04fb 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -43,15 +43,14 @@ endif if OS_WIN32 export_symbols = -export-symbols $(srcdir)/gthread.def -install-libtool-import-lib: - $(INSTALL) .libs/libgthread-2.0.dll.a $(DESTDIR)$(libdir) +install-def-file: $(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 +uninstall-def-file: + -rm $(DESTDIR)$(libdir)/gthread-2.0.def else -install-libtool-import-lib: -uninstall-libtool-import-lib: +install-def-file: +uninstall-def-file: endif libgthread_2_0_la_SOURCES = gthread-impl.c @@ -77,7 +76,7 @@ dist-hook: $(BUILT_EXTRA_DIST) if test -f $$f; then d=.; else d=$(srcdir); fi; \ cp $$d/$$f $(distdir) || exit 1; done -install-data-local: install-ms-lib install-libtool-import-lib +install-data-local: install-ms-lib install-def-file -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib +uninstall-local: uninstall-ms-lib uninstall-def-file