diff options
| -rw-r--r-- | libhurd-mm/ChangeLog | 6 | ||||
| -rw-r--r-- | libhurd-mm/Makefile.am | 2 | ||||
| -rw-r--r-- | libhurd-mm/headers.m4 | 18 | ||||
| -rw-r--r-- | libhurd-slab/ChangeLog | 6 | ||||
| -rw-r--r-- | libhurd-slab/Makefile.am | 2 | ||||
| -rw-r--r-- | libhurd-slab/headers.m4 | 8 | ||||
| -rw-r--r-- | libpthread/ChangeLog | 4 | ||||
| -rw-r--r-- | libpthread/Makefile.am | 3 | ||||
| -rw-r--r-- | libpthread/headers.m4 | 52 |
9 files changed, 71 insertions, 30 deletions
diff --git a/libhurd-mm/ChangeLog b/libhurd-mm/ChangeLog index c6ae6b6..aabf704 100644 --- a/libhurd-mm/ChangeLog +++ b/libhurd-mm/ChangeLog @@ -1,3 +1,9 @@ +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. + 2008-05-29 Neal H. Walfield <neal@gnu.org> * exceptions.c (exception_handler_activated): Assume the fault is diff --git a/libhurd-mm/Makefile.am b/libhurd-mm/Makefile.am index 63d1726..4a148d7 100644 --- a/libhurd-mm/Makefile.am +++ b/libhurd-mm/Makefile.am @@ -22,7 +22,9 @@ if ARCH_IA32 ARCH_SOURCES = ia32-exception-entry.S endif +if ! ENABLE_TESTS lib_LIBRARIES = libhurd-mm.a +endif includehurddir = $(includedir)/hurd includehurd_HEADERS = mm.h storage.h as.h diff --git a/libhurd-mm/headers.m4 b/libhurd-mm/headers.m4 index 5cedc5e..b04bdeb 100644 --- a/libhurd-mm/headers.m4 +++ b/libhurd-mm/headers.m4 @@ -11,10 +11,16 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. AC_CONFIG_LINKS([ - include/hurd/mm.h:libhurd-mm/mm.h - include/hurd/as.h:libhurd-mm/as.h - include/hurd/storage.h:libhurd-mm/storage.h - include/hurd/capalloc.h:libhurd-mm/capalloc.h - include/hurd/pager.h:libhurd-mm/pager.h - include/hurd/anonymous.h:libhurd-mm/anonymous.h + sysroot/include/hurd/mm.h:libhurd-mm/mm.h + sysroot/include/hurd/as.h:libhurd-mm/as.h + sysroot/include/hurd/storage.h:libhurd-mm/storage.h + sysroot/include/hurd/capalloc.h:libhurd-mm/capalloc.h + sysroot/include/hurd/pager.h:libhurd-mm/pager.h + sysroot/include/hurd/anonymous.h:libhurd-mm/anonymous.h +]) + +AC_CONFIG_COMMANDS_POST([ + mkdir -p sysroot/lib libhurd-mm && + ln -sf ../../libhurd-mm/libhurd-mm.a sysroot/lib/ && + touch libhurd-mm/libhurd-mm.a ]) diff --git a/libhurd-slab/ChangeLog b/libhurd-slab/ChangeLog index 913e4a2..762459f 100644 --- a/libhurd-slab/ChangeLog +++ b/libhurd-slab/ChangeLog @@ -1,3 +1,9 @@ +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. + 2008-01-23 Neal H. Walfield <neal@gnu.org> * Makefile.am (AM_CPPFLAGS): Add -I$(LIBC)/include. diff --git a/libhurd-slab/Makefile.am b/libhurd-slab/Makefile.am index 68f2e87..3450879 100644 --- a/libhurd-slab/Makefile.am +++ b/libhurd-slab/Makefile.am @@ -19,7 +19,9 @@ # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA. +if ! ENABLE_TESTS lib_LIBRARIES = libhurd-slab.a +endif includehurddir = $(includedir)/hurd includehurd_HEADERS = slab.h diff --git a/libhurd-slab/headers.m4 b/libhurd-slab/headers.m4 index ce6b382..86bdb5c 100644 --- a/libhurd-slab/headers.m4 +++ b/libhurd-slab/headers.m4 @@ -10,4 +10,10 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -AC_CONFIG_LINKS([include/hurd/slab.h:libhurd-slab/slab.h]) +AC_CONFIG_LINKS([sysroot/include/hurd/slab.h:libhurd-slab/slab.h]) + +AC_CONFIG_COMMANDS_POST([ + mkdir -p sysroot/lib libhurd-slab && + ln -sf ../../libhurd-slab/libhurd-slab.a sysroot/lib/ && + touch libhurd-slab/libhurd-slab.a +]) diff --git a/libpthread/ChangeLog b/libpthread/ChangeLog index 3f23bee..aa535eb 100644 --- a/libpthread/ChangeLog +++ b/libpthread/ChangeLog @@ -1,5 +1,9 @@ 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. + * sysdeps/generic/sem-timedwait.c: Don't include <error.h>. 2008-05-29 Neal H. Walfield <neal@gnu.org> diff --git a/libpthread/Makefile.am b/libpthread/Makefile.am index 0dae132..3c7e63d 100644 --- a/libpthread/Makefile.am +++ b/libpthread/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/libpthread/headers.m4 b/libpthread/headers.m4 index 2fde3a6..1812e7d 100644 --- a/libpthread/headers.m4 +++ b/libpthread/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 ]) |