From 20af1ed3095e570c3aa8413f9c0d8f1ce4a554d6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 22 Oct 2001 22:14:26 +0000 Subject: [PATCH] If we have built the MSVC import library, install it. Install the gcc 2001-10-23 Tor Lillqvist * {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. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/Makefile.am | 21 ++++++++++++++++++++- gmodule/ChangeLog | 6 ++++++ gmodule/Makefile.am | 22 ++++++++++++++++++++++ gobject/ChangeLog | 5 +++++ gobject/Makefile.am | 22 ++++++++++++++++++++++ gthread/ChangeLog | 6 ++++++ gthread/Makefile.am | 21 +++++++++++++++++++++ 15 files changed, 150 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 408a6eb..41ca5fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * glib/Makefile.am: (Win32): If we have built the MSVC import + library, install it. Install the gcc import library. Also support + uninstall. + 2001-10-19 Tor Lillqvist * configure.in: Fix test for lib.exe. Can't set ms_librarian diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 408a6eb..41ca5fc 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * glib/Makefile.am: (Win32): If we have built the MSVC import + library, install it. Install the gcc import library. Also support + uninstall. + 2001-10-19 Tor Lillqvist * configure.in: Fix test for lib.exe. Can't set ms_librarian diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 408a6eb..41ca5fc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * glib/Makefile.am: (Win32): If we have built the MSVC import + library, install it. Install the gcc import library. Also support + uninstall. + 2001-10-19 Tor Lillqvist * configure.in: Fix test for lib.exe. Can't set ms_librarian diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 408a6eb..41ca5fc 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * glib/Makefile.am: (Win32): If we have built the MSVC import + library, install it. Install the gcc import library. Also support + uninstall. + 2001-10-19 Tor Lillqvist * configure.in: Fix test for lib.exe. Can't set ms_librarian diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 408a6eb..41ca5fc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * glib/Makefile.am: (Win32): If we have built the MSVC import + library, install it. Install the gcc import library. Also support + uninstall. + 2001-10-19 Tor Lillqvist * configure.in: Fix test for lib.exe. Can't set ms_librarian diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 408a6eb..41ca5fc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * glib/Makefile.am: (Win32): If we have built the MSVC import + library, install it. Install the gcc import library. Also support + uninstall. + 2001-10-19 Tor Lillqvist * configure.in: Fix test for lib.exe. Can't set ms_librarian diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 408a6eb..41ca5fc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * glib/Makefile.am: (Win32): If we have built the MSVC import + library, install it. Install the gcc import library. Also support + uninstall. + 2001-10-19 Tor Lillqvist * configure.in: Fix test for lib.exe. Can't set ms_librarian diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 408a6eb..41ca5fc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * glib/Makefile.am: (Win32): If we have built the MSVC import + library, install it. Install the gcc import library. Also support + uninstall. + 2001-10-19 Tor Lillqvist * configure.in: Fix test for lib.exe. Can't set ms_librarian diff --git a/glib/Makefile.am b/glib/Makefile.am index 044952e..7efa518 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -19,6 +19,15 @@ lib_LTLIBRARIES = libglib-1.3.la if MS_LIB_AVAILABLE noinst_DATA = glib-1.3.lib + +install-ms-lib: + $(INSTALL) glib-1.3.lib $(DESTDIR)$(libdir) + +uninstall-ms-lib: + -rm $(DESTDIR)$(libdir)/glib-1.3.lib +else +install-ms-lib: +uninstall-ms-lib: endif libglib_1_3_la_SOURCES = \ @@ -127,13 +136,15 @@ glibsubinclude_HEADERS = \ gutils.h \ gwin32.h -install-data-local: +install-data-local: install-ms-lib install-libtool-import-lib @if test -f $(glibincludedir)/glist.h ; then \ echo "*** Old headers found in $(glibincludedir). You should remove the" ; \ echo "*** contents of this directory and type 'make install' again." ; \ false ; \ fi +uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib + if PLATFORM_WIN32 no_undefined = -no-undefined @@ -141,6 +152,14 @@ endif if OS_WIN32 # This requires a very new libtool export_symbols = -export-symbols glib.def + +install-libtool-import-lib: + $(INSTALL) .libs/libglib-1.3.dll.a $(DESTDIR)$(libdir) +uninstall-libtool-import-lib: + -rm $(DESTDIR)$(libdir)/libglib-1.3.dll.a +else +install-libtool-import-lib: +uninstall-libtool-import-lib: endif libglib_1_3_la_LIBADD = libcharset/libcharset.la @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @ICONV_LIBS@ @G_LIBS_EXTRA@ diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index fb9e635..a8e5d59 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * 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 * gmodule-win32.c (_g_module_build_path): More Unix compatibility: diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 4678cb4..2f97728 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 diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 8f9a039..7b7416e 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +2001-10-23 Tor Lillqvist + + * Makefile.am: (Win32): If we have built the MSVC import library, + install it. Install the gcc import library. Also support + uninstall. 2001-10-13 Matthias Clasen diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 1708392..44d1e13 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -19,13 +19,31 @@ lib_LTLIBRARIES = libgobject-1.3.la if MS_LIB_AVAILABLE noinst_DATA = gobject-1.3.lib + +install-ms-lib: + $(INSTALL) gobject-1.3.lib $(DESTDIR)$(libdir) + +uninstall-ms-lib: + -rm $(DESTDIR)$(libdir)/gobject-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 gobject.def + +install-libtool-import-lib: + $(INSTALL) .libs/libgobject-1.3.dll.a $(DESTDIR)$(libdir) +uninstall-libtool-import-lib: + -rm $(DESTDIR)$(libdir)/libgobject-1.3.dll.a +else +install-libtool-import-lib: +uninstall-libtool-import-lib: endif # libtool stuff: set version and export symbols for resolving @@ -225,3 +243,7 @@ dist-hook: $(BUILT_EXTRA_DIST) for f in $$files; do \ 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 diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 6ca265f..5d85352 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,9 @@ +2001-10-23 Tor Lillqvist + + * Makefile.am: (Win32): If we have built the MSVC import library, + install it. Install the gcc import library. Also support + uninstall. + 2001-09-28 Tor Lillqvist * gthread-win32.c: Use an extra level of indirection for GMutex. diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 1c35e1c..b5b1254 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -27,13 +27,31 @@ lib_LTLIBRARIES = libgthread-1.3.la if MS_LIB_AVAILABLE noinst_DATA = gthread-1.3.lib + +install-ms-lib: + $(INSTALL) gthread-1.3.lib $(DESTDIR)$(libdir) + +uninstall-ms-lib: + -rm $(DESTDIR)$(libdir)/gthread-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 gthread.def + +install-libtool-import-lib: + $(INSTALL) .libs/libgthread-1.3.dll.a $(DESTDIR)$(libdir) +uninstall-libtool-import-lib: + -rm $(DESTDIR)$(libdir)/libgthread-1.3.dll.a +else +install-libtool-import-lib: +uninstall-libtool-import-lib: endif libgthread_1_3_la_SOURCES = gthread-impl.c @@ -68,3 +86,6 @@ 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 -- 2.7.4