From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 3/3] Don't use -I for common subdirectory
Date: Wed, 23 Jan 2019 17:30:00 -0000 [thread overview]
Message-ID: <20190123172954.24421-4-tom@tromey.com> (raw)
In-Reply-To: <20190123172954.24421-1-tom@tromey.com>
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.
2019-01-23 Tom Tromey <tom@tromey.com>
* Makefile.in (GDB_CFLAGS): Don't add -I for common.
gdb/gdbserver/ChangeLog
2019-01-23 Tom Tromey <tom@tromey.com>
* 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/Makefile.in b/gdb/Makefile.in
index 215ef7933c..72ca855eb0 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/Makefile.in b/gdb/gdbserver/Makefile.in
index 4ae13692a2..8cffe3dda2 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.17.2
next prev parent reply other threads:[~2019-01-23 17:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 17:30 [PATCH 0/3] Normalize common includes Tom Tromey
2019-01-23 17:30 ` Tom Tromey [this message]
2019-01-23 17:30 ` [PATCH 2/3] Normalize includes to use common/ Tom Tromey
2019-01-25 4:17 ` [PATCH 0/3] Normalize common includes Joel Brobecker
2019-01-25 14:28 ` Tom Tromey
2019-01-25 16:47 ` John Baldwin
2019-01-25 21:32 ` Tom Tromey
[not found] ` <20190123172954.24421-2-tom@tromey.com>
2019-01-26 1:00 ` [PATCH 1/3] Update create-version.sh to use common/version.h Simon Marchi
[not found] ` <6adb597a88e229b7996d156ea8208438@polymtl.ca>
2019-01-26 3:58 ` Tom Tromey
2019-01-26 4:04 ` Tom Tromey
2019-01-26 4:41 ` Simon Marchi
2019-01-26 5:03 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190123172954.24421-4-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox