summaryrefslogtreecommitdiff
path: root/libcpu
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2013-04-25 16:50:11 -0400
committerMark Wielaard <mjw@redhat.com>2013-04-26 10:06:08 +0200
commitcdaaf2153a1f40d1be080c8ff6e10767b51a1c96 (patch)
tree8b61f93a23322c3b446226137c617ce0181e252d /libcpu
parentd4744a7f641bbafe1a92529a812277052ae67029 (diff)
downloadelfutils-cdaaf2153a1f40d1be080c8ff6e10767b51a1c96.tar.gz
Updates for Automake 1.13.
autoreconf will install config/test-driver, ignore it. Update gettext m4 and po files to version 0.18.2. Use AM_CPPFLAGS instead of INCLUDES. All changes are backward compatible with Automake 1.11.
Diffstat (limited to 'libcpu')
-rw-r--r--libcpu/ChangeLog4
-rw-r--r--libcpu/Makefile.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index 5f7ed044..ef9d7754 100644
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-24 Mark Wielaard <mjw@redhat.com>
+
+ * Makefile.am: Use AM_CPPFLAGS instead of INCLUDES.
+
2012-10-10 Roland McGrath <roland@hack.frob.com>
* Makefile.am (%_defs, $(srcdir)/%_dis.h): Redirect to temp file,
diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am
index 1ef88010..13e36714 100644
--- a/libcpu/Makefile.am
+++ b/libcpu/Makefile.am
@@ -28,7 +28,7 @@
## not, see <http://www.gnu.org/licenses/>.
##
include $(top_srcdir)/config/eu.am
-INCLUDES += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
+AM_CPPFLAGS += -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=)