Don't store address of local variable in hashtable.

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

diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 7e577f2..41750af 100644 (file)
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -1,23 +1,48 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gthread -DG_LOG_DOMAIN=\"GThread\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gthread \
+       -DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ \
+       @GLIB_DEBUG_FLAGS@
 
 EXTRA_DIST =                           \
+               makefile.mingw.in       \
+               makefile.msc.in         \
                gthread-posix.c         \
                gthread-solaris.c       \
-               gthread-nspr.c          \
-               gthread-none.c
+               gthread-none.c          \
+               gthread.def             \
+               gthread.rc.in
+
+BUILT_EXTRA_DIST = \
+               makefile.mingw          \
+               makefile.msc            \
+               gthread.rc
 
 libglib = $(top_builddir)/libglib.la # -lglib
 
-lib_LTLIBRARIES = libgthread.la
+top_builddir_full=`cd \$(top_builddir); pwd`
+
+lib_LTLIBRARIES = libgthread-1.3.la
 
-libgthread_la_SOURCES = gthread.c
-libgthread_la_LDFLAGS = \
+libgthread_1_3_la_SOURCES = gthread-impl.c
+libgthread_1_3_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       -release $(LT_RELEASE)
+       -export-dynamic
+
+libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@
+
+gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
+       cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.mingw.in
+       cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.msc.in
+       cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-libgthread_la_LIBADD = @G_THREAD_LIBS@
+dist-hook: $(BUILT_EXTRA_DIST)
+       files='$(BUILT_EXTRA_DIST)'; \
+       for f in $$files; do \
+         if test -f $$f; then d=.; else d=$(srcdir); fi; \
+         cp $$d/$$f $(distdir) || exit 1; done
 
-noinst_PROGRAMS = testgthread
-testgthread_LDADD = ../libglib.la libgthread.la