diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2012-03-03 20:14:02 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2012-03-03 20:16:41 +0400 |
| commit | 6c0c226bed97ccca1cae86c4c8504dcf737c210e (patch) | |
| tree | b5a6395b3c9a05a8079121297980e26a219fbaa6 /eglib | |
| parent | 48d2444470446e768041e690029035e54e0de7e0 (diff) | |
Revert "Get rid of the <foo>-static libraries, libtool doesn't know that they need to be compiled only in static mode, so each source file was compiled up to 8 times. Pass -static in the _LDFLAGS for the mono executables instead."
This reverts commit 8e386cce7f723f16624b49b3074b09e3e34da39d.
The libtool convenience libraries only contain the PIC versions of object files, causing fast tls support to fail.
Diffstat (limited to 'eglib')
| -rw-r--r-- | eglib/src/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/eglib/src/Makefile.am b/eglib/src/Makefile.am index 7ab0f276b6f..94bee684e04 100644 --- a/eglib/src/Makefile.am +++ b/eglib/src/Makefile.am @@ -1,4 +1,4 @@ -noinst_LTLIBRARIES = libeglib.la +noinst_LTLIBRARIES = libeglib.la libeglib-static.la win_files = \ eglib-config.hw \ @@ -56,6 +56,8 @@ libeglib_la_SOURCES = \ $(vasprintf_files) libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2 +libeglib_static_la_SOURCES=$(libeglib_la_SOURCES) +libeglib_static_la_CFLAGS = $(libeglib_la_CFLAGS) INCLUDES = -I$(srcdir) @@ -67,6 +69,9 @@ libeglib_la_LIBADD = -llog endif endif +libeglib_static_la_LIBADD = $(libeglib_la_LIBADD) $(LIBICONV) +libeglib_static_la_LDFLAGS = -static + MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = eglib-config.h.in $(win_files) $(unix_files) |