libtool installs/uninstalls the import library, no need to do it

2005-06-26  Tor Lillqvist  <tml@novell.com>

	* Makefile.am: libtool installs/uninstalls the import library, no
	need to do it ourselves. Do still install/uninstall the .def file,
	though.

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 384875796da6bf09c75b8d677401ae6b12b7ddd6..85da185028034498228b433534b07869547037bf 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-26  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <tml@novell.com>
 
        * Makefile.am (install-libtool-import-lib): Current GNU tools do

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 58fffda8c799c74211a2831a66d2196529fcb49e..0c9cbbd9075e161d71cf306ec7b85b2259e8589f 100644 (file)
--- 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 702bcfbe84772c629b3f1c7959a3a35a9c82ee7c..5cc616d3243176fdb58e4ba77eef4091a0dbf5c6 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-26  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <tml@novell.com>
 
        * Makefile.am (install-libtool-import-lib): Current GNU tools do

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index eb636fd5b5b89dc5159f63c34a906a308f62a215..d758a03f936caf18cb002f81218a69a34ab63957 100644 (file)
--- 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 d13d6acb0bf4930a5758b252e4aebaaab24c3ae1..7f43fc5fae37fbd3bfa05077365b8d534e213ba7 100644 (file)
--- a/gthread/ChangeLog
+++ b/gthread/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-26  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * === Released 2.7.0 ===

diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index a6d7b6e520af63eecee68f57243d26f7aa3a1485..7f39f04fb39434cd17520c246796040eaa6ce11a 100644 (file)
--- 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