2008-05-29 Thomas Schwinge <tschwinge@gnu.org>

	* headers.m4: Link files into `sysroot/include/' instead of `include/'.
	Create symbolic link to package's library in `sysroot/lib/'.
	* Makefile.am [ENABLE_TESTS]: Don't build package's library.

2 files changed, 32 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index 0dae132a..3c7e63db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,10 @@ AM_CFLAGS = $(USER_CFLAGS)
 # Sources.
 SYSDEPS := lockfile.c
 
+if ! ENABLE_TESTS
 noinst_LIBRARIES = libpthread.a
+endif
+
 libpthread_a_SOURCES = pt-attr.c pt-attr-destroy.c pt-attr-getdetachstate.c \
 	pt-attr-getguardsize.c pt-attr-getinheritsched.c		    \
 	pt-attr-getschedparam.c pt-attr-getschedpolicy.c pt-attr-getscope.c \
diff --git a/headers.m4 b/headers.m4
index 2fde3a62..1812e7d0 100644
--- a/headers.m4
+++ b/headers.m4
@@ -11,27 +11,33 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 AC_CONFIG_LINKS([
-  include/pthread.h:libpthread/include/pthread.h
-  include/pthread/pthread.h:libpthread/include/pthread/pthread.h
-  include/bits/memory.h:libpthread/sysdeps/${arch}/bits/memory.h
-  include/bits/spin-lock.h:libpthread/sysdeps/${arch}/bits/spin-lock.h
-  include/bits/pthreadtypes.h:libpthread/sysdeps/generic/bits/pthreadtypes.h
-  include/bits/barrier-attr.h:libpthread/sysdeps/generic/bits/barrier-attr.h
-  include/bits/barrier.h:libpthread/sysdeps/generic/bits/barrier.h
-  include/bits/cancelation.h:libpthread/sysdeps/generic/bits/cancelation.h
-  include/bits/condition-attr.h:libpthread/sysdeps/generic/bits/condition-attr.h
-  include/bits/condition.h:libpthread/sysdeps/generic/bits/condition.h
-  include/bits/mutex-attr.h:libpthread/sysdeps/generic/bits/mutex-attr.h
-  include/bits/mutex.h:libpthread/sysdeps/generic/bits/mutex.h
-  include/bits/once.h:libpthread/sysdeps/generic/bits/once.h
-  include/bits/pthread.h:libpthread/sysdeps/generic/bits/pthread.h
-  include/bits/rwlock-attr.h:libpthread/sysdeps/generic/bits/rwlock-attr.h
-  include/bits/rwlock.h:libpthread/sysdeps/generic/bits/rwlock.h
-  include/bits/thread-attr.h:libpthread/sysdeps/generic/bits/thread-attr.h
-  include/bits/thread-barrier.h:libpthread/sysdeps/generic/bits/thread-barrier.h
-  include/bits/thread-specific.h:libpthread/sysdeps/generic/bits/thread-specific.h
-  include/bits/pthread-np.h:libpthread/sysdeps/l4/hurd/bits/pthread-np.h
-  include/semaphore.h:libpthread/include/semaphore.h
-  include/bits/semaphore.h:libpthread/sysdeps/generic/bits/semaphore.h
-  include/signal.h:libpthread/signal/signal.h
+  sysroot/include/pthread.h:libpthread/include/pthread.h
+  sysroot/include/pthread/pthread.h:libpthread/include/pthread/pthread.h
+  sysroot/include/bits/memory.h:libpthread/sysdeps/${arch}/bits/memory.h
+  sysroot/include/bits/spin-lock.h:libpthread/sysdeps/${arch}/bits/spin-lock.h
+  sysroot/include/bits/pthreadtypes.h:libpthread/sysdeps/generic/bits/pthreadtypes.h
+  sysroot/include/bits/barrier-attr.h:libpthread/sysdeps/generic/bits/barrier-attr.h
+  sysroot/include/bits/barrier.h:libpthread/sysdeps/generic/bits/barrier.h
+  sysroot/include/bits/cancelation.h:libpthread/sysdeps/generic/bits/cancelation.h
+  sysroot/include/bits/condition-attr.h:libpthread/sysdeps/generic/bits/condition-attr.h
+  sysroot/include/bits/condition.h:libpthread/sysdeps/generic/bits/condition.h
+  sysroot/include/bits/mutex-attr.h:libpthread/sysdeps/generic/bits/mutex-attr.h
+  sysroot/include/bits/mutex.h:libpthread/sysdeps/generic/bits/mutex.h
+  sysroot/include/bits/once.h:libpthread/sysdeps/generic/bits/once.h
+  sysroot/include/bits/pthread.h:libpthread/sysdeps/generic/bits/pthread.h
+  sysroot/include/bits/rwlock-attr.h:libpthread/sysdeps/generic/bits/rwlock-attr.h
+  sysroot/include/bits/rwlock.h:libpthread/sysdeps/generic/bits/rwlock.h
+  sysroot/include/bits/thread-attr.h:libpthread/sysdeps/generic/bits/thread-attr.h
+  sysroot/include/bits/thread-barrier.h:libpthread/sysdeps/generic/bits/thread-barrier.h
+  sysroot/include/bits/thread-specific.h:libpthread/sysdeps/generic/bits/thread-specific.h
+  sysroot/include/bits/pthread-np.h:libpthread/sysdeps/l4/hurd/bits/pthread-np.h
+  sysroot/include/semaphore.h:libpthread/include/semaphore.h
+  sysroot/include/bits/semaphore.h:libpthread/sysdeps/generic/bits/semaphore.h
+  sysroot/include/signal.h:libpthread/signal/signal.h
+])
+
+AC_CONFIG_COMMANDS_POST([
+  mkdir -p sysroot/lib libpthread &&
+  ln -sf ../../libpthread/libpthread.a sysroot/lib/ &&
+  touch libpthread/libpthread.a
 ])