From: Petr Machata Date: Tue, 7 Apr 2009 12:35:02 +0000 (+0200) Subject: Merge branch 'dwarf' of ssh://pmachata@git.fedorahosted.org/git/elfutils into dwarf X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6b6cb6ec123904e6c08878f5450739b9884f58e;p=thirdparty%2Felfutils.git Merge branch 'dwarf' of ssh://pmachata@git.fedorahosted.org/git/elfutils into dwarf Conflicts: src/Makefile.am --- b6b6cb6ec123904e6c08878f5450739b9884f58e diff --cc src/Makefile.am index 6b8e9933e,11b9b2760..c0525feff --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -83,8 -83,9 +83,9 @@@ libar_a_SOURCES = arlib.c arlib2. dwarfcmp_SOURCES = dwarfcmp.cc - dwarflint_SOURCES = dwarflint.c dwarflint-hl.cc dwarflint-coverage.c \ - dwarflint-expected-at.cc dwarfstrings.c + dwarflint_SOURCES = dwarflint.c dwarflint.h dwarflint-hl.cc \ + dwarflint-expected-at.cc dwarflint-expected.hh \ - dwarfstrings.c ++ dwarfstrings.c dwarflint-coverage.c dwarflint-coverage.h readelf_SOURCES = readelf.c dwarfstrings.c