Make the implementation of GPrivate behave more closely as in POSIX

[platform/upstream/glib.git] / gthread / Makefile.am

diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 7f39f04..0643052 100644 (file)
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
 EXTRA_DIST =                           \
                makefile.msc.in         \
                gthread-posix.c         \
-               gthread-solaris.c       \
                gthread-win32.c         \
                gthread-none.c          \
                gthread.def             \
@@ -53,18 +52,24 @@ install-def-file:
 uninstall-def-file:
 endif
 
+if OS_WIN32
+gthread_win32_res = gthread-win32-res.o
+gthread_win32_res_ldflag = -Wl,$(gthread_win32_res)
+endif
+
 libgthread_2_0_la_SOURCES = gthread-impl.c
 libgthread_2_0_la_LDFLAGS = \
+       $(gthread_win32_res_ldflag) \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-dynamic $(no_undefined) $(export_symbols)
 
-libgthread_2_0_la_LIBADD = $(G_THREAD_WIN32_RESOURCE) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(libglib)
+libgthread_2_0_la_LIBADD = $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $(libglib)
 
-libgthread_2_0_la_DEPENDENCIES = $(G_THREAD_WIN32_RESOURCE) $(GTHREAD_DEF)
+libgthread_2_0_la_DEPENDENCIES = $(gthread_win32_res) $(GTHREAD_DEF)
 
 if OS_WIN32
-$(G_THREAD_WIN32_RESOURCE): gthread.rc
-       $(top_srcdir)/build/win32/lt-compile-resource gthread.rc $@
+gthread-win32-res.o: gthread.rc
+       $(WINDRES) gthread.rc $@
 endif
 
 gthread-2.0.lib: libgthread-2.0.la gthread.def