aboutsummaryrefslogtreecommitdiff
path: root/gdb/Makefile.in
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-10-05 18:27:29 -0600
committerTom Tromey <tom@tromey.com>2019-10-23 15:16:49 -0600
commitf16f7b7c7447c44f4c6d23fd478c7dd767cdf642 (patch)
tree1de5c3fe7e54ad5f2ea0e40a284c2ddb6cc50546 /gdb/Makefile.in
parent6999161a2a3b3cbd918570e094199184331d4f81 (diff)
downloadgdb-f16f7b7c7447c44f4c6d23fd478c7dd767cdf642.zip
gdb-f16f7b7c7447c44f4c6d23fd478c7dd767cdf642.tar.gz
gdb-f16f7b7c7447c44f4c6d23fd478c7dd767cdf642.tar.bz2
Fix opcodes includes
Now that gdb can unconditionally use a -I pointing at the top of the source tree, we can remove the ugly "../opcodes/" formulation that was needed earlier. This patch adds the -I and cleans up these includes. gdb/ChangeLog 2019-10-23 Tom Tromey <tom@tromey.com> * arc-tdep.c: Remove ".." from include. * frv-tdep.c: Remove ".." from include. * lm32-tdep.c: Remove ".." from include. * microblaze-tdep.c: Remove ".." from include. * or1k-tdep.h: Remove ".." from include. * s12z-tdep.c: Remove ".." from include. * Makefile.in (OPCODES_CFLAGS): Add comment. (TOP_CFLAGS): New variable. (INTERNAL_CFLAGS_BASE): Add TOP_CFLAGS. Change-Id: I21428726d55f9fab0c9da90b56f6664f258cf91a
Diffstat (limited to 'gdb/Makefile.in')
-rw-r--r--gdb/Makefile.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index fe599b4..c924373 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -459,8 +459,12 @@ OPCODES = $(OPCODES_DIR)/libopcodes.a
# Where are the other opcode tables which only have header file
# versions?
OP_INCLUDE = $(INCLUDE_DIR)/opcode
+# See TOP_CFLAGS as well.
OPCODES_CFLAGS = -I$(OP_INCLUDE)
+# Allow includes like "opcodes/mumble.h".
+TOP_CFLAGS = -I$(top_srcdir)/..
+
# The simulator is usually nonexistent; targets that include one
# should set this to list all the .o or .a files to be linked in.
SIM = @SIM@
@@ -576,7 +580,7 @@ INTERNAL_CFLAGS_BASE = \
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) $(ZLIBINC) \
$(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \
$(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) \
- $(SRCHIGH_CFLAGS)
+ $(SRCHIGH_CFLAGS) $(TOP_CFLAGS)
INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)