X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fpthread;h=e583929e1b762e8788c70b1868212981f05b8005;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=2a729397aa828bf203147c2ebc4ecb91984640ff;hpb=b4b6391081d1173278396afdf098be68b1768752;p=gnulib.git

diff --git a/modules/pthread b/modules/pthread
index 2a729397a..e583929e1 100644
--- a/modules/pthread
+++ b/modules/pthread
@@ -2,25 +2,30 @@ Description:
 Implement a trivial subset of the pthreads library.
 
 Files:
+lib/pthread.c
 lib/pthread.in.h
 m4/pthread.m4
 
 Depends-on:
+extern-inline
 sched
 time
 
 configure.ac:
 gl_PTHREAD_CHECK
+gl_MODULE_INDICATOR([pthread])
 
 Makefile.am:
 BUILT_SOURCES += $(PTHREAD_H)
 
 # We need the following in order to create <pthread.h> when the system
 # doesn't have one that works with the given compiler.
+if GL_GENERATE_PTHREAD_H
 pthread.h: pthread.in.h $(top_builddir)/config.status
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -30,6 +35,10 @@ pthread.h: pthread.in.h $(top_builddir)/config.status
 	      < $(srcdir)/pthread.in.h; \
 	} > $@-t && \
 	mv $@-t $@
+else
+pthread.h: $(top_builddir)/config.status
+	rm -f $@
+endif
 MOSTLYCLEANFILES += pthread.h pthread.h-t
 
 Include: