diff options
| -rw-r--r-- | linuxthreads/ChangeLog | 4 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 7d4cc40832..3b87581339 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2002-07-22 Ulrich Drepper <drepper@redhat.com> + + * Makefile: Actually creat tst-signal.out file when running the test. + 2002-07-19 Ulrich Drepper <drepper@redhat.com> * errno.c (__errno_location): Don't define unless !USE_TLS diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index a44b9bb834..9c5cd8f1bf 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -63,6 +63,11 @@ tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \ ex17 ex18 tst-cancel tst-context bug-sleep test-srcs = tst-signal +ifeq ($(build-static),yes) +tests += tststatic +tests-static += tststatic +endif + ifeq (yes,$(build-shared)) tests-nodelete-yes = unload endif @@ -90,7 +95,9 @@ $(objpfx)libpthread.so: $(common-objpfx)libc.so \ # Make sure we link with the thread library. ifeq ($(build-shared),yes) -$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.so +$(addprefix $(objpfx), \ + $(filter-out $(tests-static), \ + $(tests) $(test-srcs))): $(objpfx)libpthread.so $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.so $(objpfx)unload: $(common-objpfx)dlfcn/libdl.so else @@ -102,6 +109,10 @@ $(tests:%=$(objpfx)%-bp): $(objpfx)libpthread_b.a $(librt-tests:%=$(objpfx)%-bp): $(common-objpfx)rt/librt_b.a endif +ifeq ($(build-static),yes) +$(addprefix $(objpfx), $(tests-static)): $(objpfx)libpthread.a +endif + ifeq ($(build-shared),yes) vpath pt-initfini.c $(full_config_sysdirs) @@ -135,6 +146,6 @@ ifeq (no,$(cross-compiling)) ifeq (yes,$(build-shared)) tests: $(objpfx)tst-signal.out $(objpfx)tst-signal.out: tst-signal.sh $(objpfx)tst-signal - $(SHELL) -e $< $(common-objpfx) + $(SHELL) -e $< $(common-objpfx) > $@ endif endif |