From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 9 Mar 2001 21:41:37 +0000 (+0000)
Subject: Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined
X-Git-Tag: GLIB_1_3_3~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c5f5a01ce79ed29a7a6d945146c907ddc564d95;p=platform%2Fupstream%2Fglib.git

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

diff --git a/gthread/ChangeLog b/gthread/ChangeLog
index 3675496..9aab5a8 100644
--- a/gthread/ChangeLog
+++ b/gthread/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2001-02-15  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gthread-posix.c: Removed the G_THREAD_USE_PID_SURROGATE
diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 41750af..4780748 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
diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c
index 6d19499..01c682b 100644
--- a/gthread/gthread-impl.c
+++ b/gthread/gthread-impl.c
@@ -318,7 +318,7 @@ g_thread_init (GThreadFunctions* init)
   else
     g_thread_use_default_impl = FALSE;
 
-#if defined (G_OS_WIN32) && defined (__GNUC__)
+#if defined (G_PLATFORM_WIN32) && defined (__GNUC__)
   memcpy(&g_thread_functions_for_glib_use, init, sizeof (*init));
 #else
   g_thread_functions_for_glib_use = *init;