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.
This commit is contained in:
Tor Lillqvist 2001-10-22 22:14:26 +00:00 committed by Tor Lillqvist
parent d3cbb4888e
commit 20af1ed309
15 changed files with 150 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2001-10-23 Tor Lillqvist <tml@iki.fi>
* 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 <tml@iki.fi>
* configure.in: Fix test for lib.exe. Can't set ms_librarian

View File

@ -1,3 +1,9 @@
2001-10-23 Tor Lillqvist <tml@iki.fi>
* 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 <tml@iki.fi>
* configure.in: Fix test for lib.exe. Can't set ms_librarian

View File

@ -1,3 +1,9 @@
2001-10-23 Tor Lillqvist <tml@iki.fi>
* 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 <tml@iki.fi>
* configure.in: Fix test for lib.exe. Can't set ms_librarian

View File

@ -1,3 +1,9 @@
2001-10-23 Tor Lillqvist <tml@iki.fi>
* 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 <tml@iki.fi>
* configure.in: Fix test for lib.exe. Can't set ms_librarian

View File

@ -1,3 +1,9 @@
2001-10-23 Tor Lillqvist <tml@iki.fi>
* 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 <tml@iki.fi>
* configure.in: Fix test for lib.exe. Can't set ms_librarian

View File

@ -1,3 +1,9 @@
2001-10-23 Tor Lillqvist <tml@iki.fi>
* 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 <tml@iki.fi>
* configure.in: Fix test for lib.exe. Can't set ms_librarian

View File

@ -1,3 +1,9 @@
2001-10-23 Tor Lillqvist <tml@iki.fi>
* 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 <tml@iki.fi>
* configure.in: Fix test for lib.exe. Can't set ms_librarian

View File

@ -1,3 +1,9 @@
2001-10-23 Tor Lillqvist <tml@iki.fi>
* 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 <tml@iki.fi>
* configure.in: Fix test for lib.exe. Can't set ms_librarian

View File

@ -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@

View File

@ -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:

View File

@ -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

View File

@ -1,3 +1,8 @@
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-13 Matthias Clasen <matthiasc@poet.de>

View File

@ -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

View File

@ -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-09-28 Tor Lillqvist <tml@iki.fi>
* gthread-win32.c: Use an extra level of indirection for GMutex.

View File

@ -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