diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-10-22 22:14:26 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-10-22 22:14:26 +0000 |
| commit | 20af1ed3095e570c3aa8413f9c0d8f1ce4a554d6 (patch) | |
| tree | 734439cc0757068280a81f171d0ff136259d7edb /gmodule | |
| parent | d3cbb4888eea60bed024a575184a0ac6c5061dea (diff) | |
If we have built the MSVC import library, install it. Install the gcc
2001-10-23 Tor Lillqvist <tml@iki.fi>
* {glib,gmodule,gobject,gthread}/Makefile.am: (Win32): If we
have built the MSVC import library, install it. Install the
gcc import library. Also support uninstall.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/ChangeLog | 6 | ||||
| -rw-r--r-- | gmodule/Makefile.am | 22 |
2 files changed, 28 insertions, 0 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index fb9e635ca..a8e5d59db 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist <tml@iki.fi> + + * Makefile.am: (Win32): If we have built the MSVC import library, + install it. Install the gcc import library. Also support + uninstall. + 2001-10-09 Tor Lillqvist <tml@iki.fi> * gmodule-win32.c (_g_module_build_path): More Unix compatibility: diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 4678cb4e6..2f977287a 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -37,14 +37,32 @@ noinst_LTLIBRARIES = libgplugin_a.la libgplugin_b.la if MS_LIB_AVAILABLE noinst_DATA = gmodule-1.3.lib + +install-ms-lib: + $(INSTALL) gmodule-1.3.lib $(DESTDIR)$(libdir) + +uninstall-ms-lib: + -rm $(DESTDIR)$(libdir)/gmodule-1.3.lib +else +install-ms-lib: +uninstall-ms-lib: endif if PLATFORM_WIN32 no_undefined = -no-undefined endif + if OS_WIN32 export_symbols = -export-symbols gmodule.def plugin_rpath = -rpath `pwd` + +install-libtool-import-lib: + $(INSTALL) .libs/libgmodule-1.3.dll.a $(DESTDIR)$(libdir) +uninstall-libtool-import-lib: + -rm $(DESTDIR)$(libdir)/libgmodule-1.3.dll.a +else +install-libtool-import-lib: +uninstall-libtool-import-lib: endif libgmodule_1_3_la_SOURCES = gmodule.c @@ -106,3 +124,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 + +uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib |