Revert "Get rid of the <foo>-static libraries, libtool doesn't know that they need...

This reverts commit 8e386cce7f723f16624b49b3074b09e3e34da39d.

The libtool convenience libraries only contain the PIC versions of object files, causing fast tls support to fail.

diff --git a/Makefile.am b/Makefile.am
index 4de6cbcba50634ccb694c47a4b449b9e5c76b695..e8a0fd5cb3d5099df040608dfa1095b7f93b3b84 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,12 @@ SUBDIRS = m4 include doc
 
 INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
 
-noinst_LTLIBRARIES = libmonogc.la
+#
+# libtool is not capable of creating shared/static versions of a convenience
+# library, so we have to do it ourselves
+#
+
+noinst_LTLIBRARIES = libmonogc.la libmonogc-static.la
 
 EXTRA_DIST = 
     ## more items will be succesively added below
@@ -57,6 +62,10 @@ EXTRA_libmonogc_la_SOURCES = alpha_mach_dep.S \
     rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
     sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
 
+libmonogc_static_la_SOURCES = $(libmonogc_la_SOURCES)
+libmonogc_static_la_LIBADD = $(libmonogc_la_LIBADD)
+libmonogc_static_la_LDFLAGS = -static
+
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
 
 AM_CFLAGS = @GC_CFLAGS@