diff options
| author | Zachary T Welch <zwelch@codesourcery.com> | 2010-11-08 17:16:34 -0800 |
|---|---|---|
| committer | Arun Sharma <aruns@google.com> | 2010-11-29 11:28:35 -0800 |
| commit | 7e767a2838719e00951385eeab680df872dd983f (patch) | |
| tree | dbb36222c8a4b7f9e6d991a7f18f3efbe00d11e9 /tests | |
| parent | 717239a9362810d85c9b80f0c51e977573081b47 (diff) | |
| download | libunwind-7e767a2838719e00951385eeab680df872dd983f.tar.gz | |
Improve test LDADD settings.
Eliminates unused libraries from test program linking. Substitutes
'$(top_builddir)' for '..' to clarify library locations.
Signed-off-by: Zachary T Welch <zwelch@codesourcery.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 367d38cf..0ab7b78a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,7 +18,7 @@ if REMOTE_ONLY perf: else - LIBUNWIND_local = ../src/libunwind.la + LIBUNWIND_local = $(top_builddir)/src/libunwind.la if ARCH_IA64 noinst_PROGRAMS_arch = ia64-test-dyn1 check_SCRIPTS_arch = run-ia64-test-dyn1 @@ -97,18 +97,38 @@ forker_LDFLAGS = -static Gtest_bt_SOURCES = Gtest-bt.c ident.c Ltest_bt_SOURCES = Ltest-bt.c ident.c test_ptrace_misc_SOURCES = test-ptrace-misc.c ident.c - -LIBUNWIND = ../src/libunwind-$(arch).la $(LIBUNWIND_local) -LDADD = $(LIBUNWIND) - -test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local) -ia64_test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local) -test_ptrace_LDADD = ../src/libunwind-ptrace.a $(LIBUNWIND) -Ltest_concurrent_LDADD = $(LIBUNWIND) -lpthread -Gtest_concurrent_LDADD = $(LIBUNWIND) -lpthread -test_async_sig_LDADD = $(LIBUNWIND) -lpthread -rs_race_LDADD = $(LIBUNWIND) -lpthread - -LDADD += @DLLIB@ Ltest_nomalloc_SOURCES = Ltest-nomalloc.c +LIBUNWIND_generic = $(top_builddir)/src/libunwind-$(arch).la +LIBUNWIND_ptrace = $(top_builddir)/src/libunwind-ptrace.a +LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la + +test_async_sig_LDADD = $(LIBUNWIND_generic) -lpthread +test_flush_cache_LDADD = $(LIBUNWIND_generic) +test_init_remote_LDADD = $(LIBUNWIND_generic) +test_mem_LDADD = $(LIBUNWIND_generic) +test_ptrace_LDADD = $(LIBUNWIND_ptrace) $(LIBUNWIND_generic) +test_proc_info_LDADD = $(LIBUNWIND_generic) +test_static_link_LDADD = $(LIBUNWIND_generic) +test_strerror_LDADD = $(LIBUNWIND_generic) +rs_race_LDADD = $(LIBUNWIND_generic) -lpthread + +Gtest_bt_LDADD = $(LIBUNWIND_generic) +Gtest_concurrent_LDADD = $(LIBUNWIND_generic) -lpthread +Gtest_dyn1_LDADD = $(LIBUNWIND_generic) +Gtest_exc_LDADD = $(LIBUNWIND_generic) +Gtest_init_LDADD = $(LIBUNWIND_generic) +Gtest_resume_sig_LDADD = $(LIBUNWIND_generic) +Gperf_simple_LDADD = $(LIBUNWIND_generic) + +Ltest_bt_LDADD = $(LIBUNWIND_local) +Ltest_concurrent_LDADD = $(LIBUNWIND_local) -lpthread +Ltest_dyn1_LDADD = $(LIBUNWIND_local) +Ltest_exc_LDADD = $(LIBUNWIND_local) +Ltest_init_LDADD = $(LIBUNWIND_local) +Ltest_nomalloc_LDADD = $(LIBUNWIND_local) @DLLIB@ +Ltest_resume_sig_LDADD = $(LIBUNWIND_generic) +Lperf_simple_LDADD = $(LIBUNWIND_local) + +test_setjmp_LDADD = $(LIBUNWIND_setjmp) $(LIBUNWIND_local) +ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp) $(LIBUNWIND_local) |