From a0707f3c36cab402cd4c3235bedd2b5f7b4c6aed Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 22 Jan 2019 00:26:45 -0700 Subject: [PATCH] Don't use -I for common subdirectory This changes the Makefiles to remove the -I for the common/ subdirectory. This will enforce the rule that includes must use the 'common/filename.h' form. gdb/ChangeLog 2019-01-25 Tom Tromey * Makefile.in (GDB_CFLAGS): Don't add -I for common. gdb/gdbserver/ChangeLog 2019-01-25 Tom Tromey * Makefile.in (INCLUDE_CFLAGS): Don't add -I for common. --- gdb/ChangeLog | 4 ++++ gdb/Makefile.in | 2 +- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/Makefile.in | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b893255ee93..ede7a647d4f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-01-25 Tom Tromey + + * Makefile.in (GDB_CFLAGS): Don't add -I for common. + 2019-01-25 Tom Tromey * xtensa-linux-nat.c: Fix common/ includes. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 215ef7933cb..72ca855eb07 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -543,7 +543,7 @@ CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # your system doesn't have fcntl.h in /usr/include (which is where it # should be according to Posix). DEFS = @DEFS@ -GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/common -I$(srcdir)/config \ +GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config \ -DLOCALEDIR="\"$(localedir)\"" $(DEFS) # MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 0fd3360fc0f..a244c4ffef6 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2019-01-25 Tom Tromey + + * Makefile.in (INCLUDE_CFLAGS): Don't add -I for common. + 2019-01-25 Tom Tromey * win32-low.c: Fix common/ includes. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 4ae13692a2f..8cffe3dda2d 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -118,7 +118,7 @@ GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@ # in those directories should be included with the subdirectory. # e.g.: "target/wait.h". # -INCLUDE_CFLAGS = -I. -I${srcdir} -I$(srcdir)/../common \ +INCLUDE_CFLAGS = -I. -I${srcdir} \ -I$(srcdir)/../regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \ $(INCGNU) -- 2.30.2