diff options
| author | Andreas Schwab <schwab@suse.de> | 1999-03-20 17:16:44 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 1999-03-20 17:16:44 +0000 |
| commit | df455ccb63266939408fba27120a7bbdee3457e9 (patch) | |
| tree | 90c9d9443ad66898f2e6a7cb34cd36984ff2530f /linuxthreads | |
| parent | bfe1b528468c65f1ad575bfb2a0aea48dd9ded0b (diff) | |
| download | glibc-df455ccb63266939408fba27120a7bbdee3457e9.zip glibc-df455ccb63266939408fba27120a7bbdee3457e9.tar.gz glibc-df455ccb63266939408fba27120a7bbdee3457e9.tar.bz2 | |
1999-03-19 Andreas Jaeger <aj@arthur.rhein-neckar.de> cvs/libc-as-990322
* rt/Makefile: Link against static library if no shared lib is
available.
* localedata/Makefile: The shells scripts implementing the test
require the dynamic linker which is not available with
--disable-shared. Skip the test if --disable-shared is given.
* linuxthreads/Makefile: Link test against static libpthread if no
shared lib is available.
* iconvdata/Makefile (tests): Run iconv-test only if we're
building shared libraries.
* elf/Makefile (tests): Likewise for elf tests.
* posix/Makefile: The test frameworks globtest and wordexp-test
require the dynamic linker which is not available with
--disable-shared. Skip the test if --disable-shared is given.
* grp/Makefile (otherlibs): For static nss build link against
necessary libs.
* rt/Makefile: Link against static library if no shared lib is
available.
* localedata/Makefile: The shells scripts implementing the test
require the dynamic linker which is not available with
--disable-shared. Skip the test if --disable-shared is given.
* linuxthreads/Makefile: Link test against static libpthread if no
shared lib is available.
* iconvdata/Makefile (tests): Run iconv-test only if we're
building shared libraries.
* elf/Makefile (tests): Likewise for elf tests.
* posix/Makefile: The test frameworks globtest and wordexp-test
require the dynamic linker which is not available with
--disable-shared. Skip the test if --disable-shared is given.
* grp/Makefile (otherlibs): For static nss build link against
necessary libs.
1999-03-19 Andreas Jaeger <aj@arthur.rhein-neckar.de>
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/Makefile | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index c19145f..8cc1373 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -53,9 +53,15 @@ CFLAGS-cancel.c += -D__NO_WEAK_PTHREAD_ALIASES $(objpfx)libpthread.so: $(common-objpfx)libc.so # Make sure we link with the thread library. -$(objpfx)ex1: $(objpfx)libpthread.so -$(objpfx)ex2: $(objpfx)libpthread.so -$(objpfx)ex3: $(objpfx)libpthread.so -$(objpfx)ex4: $(objpfx)libpthread.so -$(objpfx)ex5: $(objpfx)libpthread.so -$(objpfx)ex6: $(objpfx)libpthread.so +ifeq ($(build-shared),yes) +libpthread = $(objpfx)libpthread.so +else +libpthread = $(objpfx)libpthread.a +endif + +$(objpfx)ex1: $(libpthread) +$(objpfx)ex2: $(libpthread) +$(objpfx)ex3: $(libpthread) +$(objpfx)ex4: $(libpthread) +$(objpfx)ex5: $(libpthread) +$(objpfx)ex6: $(libpthread) |