2004-06-29 Roland McGrath <roland@redhat.com>

	* Banner: NPTL no longer has its own version number.
	* Makefile (nptl-version): Variable removed.
	* sysdeps/pthread/Makefile (CFLAGS-confstr.c): Set LIBPTHREAD_VERSION
	using $(version), the glibc version number.

diff --git a/nptl/Banner b/nptl/Banner
index 53444807bb01f2e6b3f4aea49917f2473adab347..7c1487e7b6db556833ce3d5f3ca707786a3e1d3b 100644 (file)
--- a/nptl/Banner
+++ b/nptl/Banner
@@ -1 +1 @@
-NPTL 0.61 by Ulrich Drepper
+Native POSIX Threads Library by Ulrich Drepper et al

diff --git a/nptl/Makefile b/nptl/Makefile
index c282c6f8ff93fd311e593009d4812f2d4d4f7d0d..56dd08939f29f3d80ced82f730eee0d4dc898467 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -21,8 +21,6 @@
 #
 subdir := nptl
 
-nptl-version := $(shell sed -n 's/^[^0-9]* \([0-9.]*\).*$$/\1/p' Banner)
-
 headers := pthread.h semaphore.h bits/semaphore.h
 
 extra-libs := libpthread

diff --git a/nptl/sysdeps/pthread/Makefile b/nptl/sysdeps/pthread/Makefile
index 05854beecd94382b6775ac52a945279f7ed8b1d0..207e10fad20bcfb1b6b6a0457d7d3d130dbd1f42 100644 (file)
--- a/nptl/sysdeps/pthread/Makefile
+++ b/nptl/sysdeps/pthread/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -48,5 +48,5 @@ endif
 endif
 
 ifeq ($(subdir),posix)
-CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../nptl/Banner)\""
+CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"NPTL $(version)"'
 endif