diff options
author | Tor Lillqvist <tml@iki.fi> | 2001-03-09 21:41:37 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2001-03-09 21:41:37 +0000 |
commit | 9c5f5a01ce79ed29a7a6d945146c907ddc564d95 (patch) | |
tree | c875da707b6e1da5de7b6f645b5aafde74b2daf4 /gthread/Makefile.am | |
parent | 137d3248c7ecbd8a012c623c9c5c7cd93ace6808 (diff) |
Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined
2001-02-21 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use libglib-1.3.la from top_builddir. Invoke
libtool with -no-undefined for Win32 and Cygwin.
* gthread-impl.c (g_thread_init): Win32 code snippet used also on
Cygwin.
Diffstat (limited to 'gthread/Makefile.am')
-rw-r--r-- | gthread/Makefile.am | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 41750af03..4780748d9 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -18,18 +18,25 @@ BUILT_EXTRA_DIST = \ makefile.msc \ gthread.rc -libglib = $(top_builddir)/libglib.la # -lglib +libglib = $(top_builddir)/libglib-1.3.la top_builddir_full=`cd \$(top_builddir); pwd` lib_LTLIBRARIES = libgthread-1.3.la +if PLATFORM_WIN32 +no_undefined = -no-undefined +endif +if OS_WIN32 +export_symbols = -export-symbols gthread.def +endif + libgthread_1_3_la_SOURCES = gthread-impl.c libgthread_1_3_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic + -export-dynamic $(no_undefined) $(export_symbols) -libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ +libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib) gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status |