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 /libcpu | |
| parent | bf96347e884ee37eee3fdacdf2a616f6856e1e49 (diff) | |
Clean up and consolidate automake magic to reduce duplication and to work with --disable-dependency-tracking.
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/ChangeLog | 4 | ||||
| -rw-r--r-- | libcpu/Makefile.am | 24 |
2 files changed, 10 insertions, 18 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index 738af57a..9d517fc8 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,7 @@ +2010-02-15 Roland McGrath <roland@redhat.com> + + * Makefile.am: Use config/eu.am for common stuff. + 2009-04-14 Roland McGrath <roland@redhat.com> * Makefile.am (AM_CFLAGS): Add -fdollars-in-identifiers; it is not the diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 923556f6..ca334bb6 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2002, 2004, 2005, 2007, 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,26 +24,14 @@ ## 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 -Wshadow -Wunused -Wextra -std=gnu99 -fpic \ - -fdollars-in-identifiers \ - $($(*F)_CFLAGS) \ - $(if $($(*F)_no_Werror),,-Werror) -INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \ - -I$(srcdir)/../libebl -I$(srcdir)/../libdw -I$(srcdir)/../libasm +include $(top_srcdir)/config/eu.am +INCLUDES += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ + -I$(srcdir)/../libdw -I$(srcdir)/../libasm +AM_CFLAGS += -fpic -fdollars-in-identifiers LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -P$(<F:lex.l=) LEX_OUTPUT_ROOT = lex.$(<F:lex.l=) AM_YFLAGS = -p$(<F:parse.y=) -if MUDFLAP -libmudflap = -lmudflap -endif - noinst_LIBRARIES = libcpu_i386.a libcpu_x86_64.a noinst_PROGRAMS = i386_gendis @@ -81,4 +69,4 @@ noinst_HEADERS = memory-access.h i386_parse.h i386_data.h EXTRA_DIST = defs/i386 -CLEANFILES = i386.mnemonics i386_dis.h x86_64.mnemonics x86_64_dis.h +CLEANFILES += i386.mnemonics i386_dis.h x86_64.mnemonics x86_64_dis.h |