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 66da12f..0643052 100644 (file)
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -5,17 +5,14 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
        @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
 
 EXTRA_DIST =                           \
-               makefile.mingw.in       \
                makefile.msc.in         \
                gthread-posix.c         \
-               gthread-solaris.c       \
                gthread-win32.c         \
                gthread-none.c          \
                gthread.def             \
                gthread.rc.in
 
 BUILT_EXTRA_DIST = \
-               makefile.mingw          \
                makefile.msc            \
                gthread.rc
 
@@ -43,31 +40,36 @@ no_undefined = -no-undefined
 endif
 
 if OS_WIN32
-export_symbols = -export-symbols gthread.def
+export_symbols = -export-symbols $(srcdir)/gthread.def
 
-install-libtool-import-lib:
-       $(INSTALL) .libs/libgthread-2.0.dll.a $(DESTDIR)$(libdir)
-       $(INSTALL) gthread.def $(DESTDIR)$(libdir)/gthread-2.0.def
+install-def-file:
+       $(INSTALL) $(srcdir)/gthread.def $(DESTDIR)$(libdir)/gthread-2.0.def
 
-uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libgthread-2.0.dll.a $(DESTDIR)$(libdir)/gthread-2.0.def
+uninstall-def-file:
+       -rm $(DESTDIR)$(libdir)/gthread-2.0.def
 else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+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
@@ -79,7 +81,7 @@ dist-hook: $(BUILT_EXTRA_DIST)
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
          cp $$d/$$f $(distdir) || exit 1; done
 
-install-data-local: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib install-def-file
 
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+uninstall-local: uninstall-ms-lib uninstall-def-file