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 /libasm | |
| 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 'libasm')
| -rw-r--r-- | libasm/ChangeLog | 4 | ||||
| -rw-r--r-- | libasm/Makefile.am | 29 |
2 files changed, 9 insertions, 24 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index d0d40396..ef31dbb2 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2009-01-10 Ulrich Drepper <drepper@redhat.com> * Makefile.am: Use USE_LOCKS instead of USE_TLS. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 7d5e25d1..52de7a3b 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2002, 2004, 2005, 2006, 2008, 2009 Red Hat, Inc. +## Copyright (C) 2002-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,22 +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 -AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -INCLUDES = -I. -I$(srcdir) -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ - -I$(top_srcdir)/lib +include $(top_srcdir)/config/eu.am +INCLUDES += -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw + GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 -COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) - lib_LIBRARIES = libasm.a if !MUDFLAP noinst_LIBRARIES = libasm_pic.a @@ -79,15 +69,6 @@ libasm.so: libasm_pic.a libasm.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 libasm.so $(mkinstalldirs) $(DESTDIR)$(libdir) $(INSTALL_PROGRAM) libasm.so $(DESTDIR)$(libdir)/libasm-$(PACKAGE_VERSION).so @@ -104,4 +85,4 @@ endif noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map -CLEANFILES = $(am_libasm_pic_a_OBJECTS) *.gcno *.gcda libasm.so.$(VERSION) +CLEANFILES += $(am_libasm_pic_a_OBJECTS) libasm.so.$(VERSION) |