diff options
| author | Roland McGrath <roland@redhat.com> | 2010-02-15 15:57:03 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2010-02-15 15:57:03 -0800 |
| commit | 22359e265395fd2f8267190ef97f5417770e6206 (patch) | |
| tree | a5503a61fed410b3585d6d9bbc3cd5852668c80f /tests | |
| parent | bf96347e884ee37eee3fdacdf2a616f6856e1e49 (diff) | |
| download | elfutils-22359e265395fd2f8267190ef97f5417770e6206.tar.gz | |
Clean up and consolidate automake magic to reduce duplication and to work with --disable-dependency-tracking.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 23 |
2 files changed, 10 insertions, 15 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 29789e2b..c871baa1 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,7 @@ 2010-02-15 Roland McGrath <roland@redhat.com> + * Makefile.am: Use config/eu.am for common stuff. + * asm-tst9.c (main): Rename local to avoid shadowing another local. 2009-07-22 Roland McGrath <roland@redhat.com> diff --git a/tests/Makefile.am b/tests/Makefile.am index 54d2c61a..1b9bc73b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 1996-2009 Red Hat, Inc. +## Copyright (C) 1996-2010 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -24,26 +24,22 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE +include $(top_srcdir)/config/eu.am if MUDFLAP -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) BUILD_RPATH = \$$ORIGIN/../backends else -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf endif AM_LDFLAGS = if !STANDALONE -INCLUDES = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/libdwfl \ - -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \ - -I$(top_srcdir)/lib -I.. +INCLUDES += -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \ + -I$(top_srcdir)/libdwfl \ + -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \ + -I$(top_srcdir)/lib -I.. AM_LDFLAGS += -Wl,-rpath-link,../libasm:../libdw:../libelf -endif !STANDALONE +endif if TESTS_RPATH AM_LDFLAGS += -Wl,-rpath,$(BUILT_RPATH) @@ -161,7 +157,6 @@ endif !STANDALONE if MUDFLAP static_build = yes -libmudflap = -lmudflap endif if STANDALONE @@ -233,11 +228,9 @@ dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl sha1_tst_LDADD = $(libeu) $(libmudflap) -dwarf_getmacros_LDADD = $(libdw) +dwarf_getmacros_LDADD = $(libdw) $(libmudflap) addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -CLEANFILES = xxx *.gcno *.gcda *gconv - if GCOV check: check-am coverage .PHONY: coverage |