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 /libdwfl | |
| 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 'libdwfl')
| -rw-r--r-- | libdwfl/ChangeLog | 2 | ||||
| -rw-r--r-- | libdwfl/Makefile.am | 29 |
2 files changed, 7 insertions, 24 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index f6d3eaff..833c2a51 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,5 +1,7 @@ 2010-02-15 Roland McGrath <roland@redhat.com> + * Makefile.am: Use config/eu.am for common stuff. + * find-debuginfo.c (find_debuginfo_in_path): Fix uninitialized variable in failure path. diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am index 69bef7d9..8ec1f4fa 100644 --- a/libdwfl/Makefile.am +++ b/libdwfl/Makefile.am @@ -2,7 +2,7 @@ ## ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. +## Copyright (C) 2005-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 @@ -26,20 +26,11 @@ ## Network licensing program, please visit www.openinventionnetwork.com ## <http://www.openinventionnetwork.com>. ## -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -if MUDFLAP -AM_CFLAGS = -fmudflap -else -AM_CFLAGS = -endif -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib +include $(top_srcdir)/config/eu.am +INCLUDES += -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw VERSION = 1 -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - noinst_LIBRARIES = libdwfl.a if !MUDFLAP noinst_LIBRARIES += libdwfl_pic.a @@ -90,7 +81,6 @@ if MUDFLAP libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu) libdw = ../libdw/libdw.a libelf = ../libelf/libelf.a -libmudflap = -lmudflap else libdwfl = $(libdw) libdw = ../libdw/libdw.so @@ -99,20 +89,11 @@ endif libebl = ../libebl/libebl.a libeu = ../lib/libeu.a - if !MUDFLAP libdwfl_pic_a_SOURCES = am_libdwfl_pic_a_OBJECTS = $(libdwfl_a_SOURCES:.c=.os) - -%.os: %.c %.o - if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ - -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ - then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \ - rm -f "$(DEPDIR)/$*.Tpo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi endif noinst_HEADERS = libdwflP.h -CLEANFILES = $(am_libdwfl_pic_a_OBJECTS) +CLEANFILES += $(am_libdwfl_pic_a_OBJECTS) |