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 /libelf | |
| 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 'libelf')
| -rw-r--r-- | libelf/ChangeLog | 4 | ||||
| -rw-r--r-- | libelf/Makefile.am | 24 |
2 files changed, 6 insertions, 22 deletions
diff --git a/libelf/ChangeLog b/libelf/ChangeLog index c71c5638..303975b3 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2010-01-07 Roland McGrath <roland@redhat.com> * elf32_getphdr.c: Use __elf_getphdrnum_rdlock. diff --git a/libelf/Makefile.am b/libelf/Makefile.am index b277e944..c7c83f35 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -24,24 +24,12 @@ ## 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 +include $(top_srcdir)/config/eu.am if BUILD_STATIC AM_CFLAGS += -fpic endif -AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ - $($(*F)_CFLAGS) -INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 -PACKAGE_VERSION = @PACKAGE_VERSION@ - -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) lib_LIBRARIES = libelf.a if !MUDFLAP @@ -118,14 +106,6 @@ libelf.so: libelf_pic.a libelf.map if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) -%.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 - install: install-am libelf.so $(mkinstalldirs) $(DESTDIR)$(libdir) $(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so @@ -142,4 +122,4 @@ noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h EXTRA_DIST = libelf.map -CLEANFILES = $(am_libelf_pic_a_OBJECTS) *.gcno *.gcda libelf.so.$(VERSION) +CLEANFILES += $(am_libelf_pic_a_OBJECTS) libelf.so.$(VERSION) |