diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-06-26 18:07:13 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-06-26 18:07:13 +0000 |
| commit | 2e13949ab603791890fd882c6a39f8cc22dcfd3d (patch) | |
| tree | 5c2618a9818022595a1cb5307f17b3f0c15e23f1 /gmodule | |
| parent | ef48ce636b948623ff2b3b83f4f0ca130ae6e7b0 (diff) | |
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.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/ChangeLog | 6 | ||||
| -rw-r--r-- | gmodule/Makefile.am | 15 |
2 files changed, 13 insertions, 8 deletions
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 <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 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 |