public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Simon Marchi <simark@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line
Date: Wed, 27 Mar 2024 01:14:23 +0000 (GMT) [thread overview]
Message-ID: <20240327011423.E9F443858C36@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2f3dfa7f90806fe1bbaeb16d22d0740a5cde69a2
commit 2f3dfa7f90806fe1bbaeb16d22d0740a5cde69a2
Author: Simon Marchi <simon.marchi@efficios.com>
Date: Tue Mar 26 15:06:43 2024 -0400
gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line
Reformat some variables definitions. I think it makes them easier to
read, and it also makes diffs clearer.
Change-Id: I82f63ba0e6d0fe268eb1f1ad5ab22c3cd016ab02
Approved-By: Pedro Alves <pedro@palves.net>
Diff:
---
gdb/Makefile.in | 39 ++++++++++++++++++++++++++++++---------
gdbserver/Makefile.in | 50 ++++++++++++++++++++++++++++++++++++++------------
gdbsupport/Makefile.am | 15 +++++++++++----
gdbsupport/Makefile.in | 15 +++++++++++----
4 files changed, 90 insertions(+), 29 deletions(-)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 331620375ae..bf57a9a3e62 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -260,7 +260,9 @@ LIBBACKTRACE_LIB=@LIBBACKTRACE_LIB@
SUPPORT = ../gdbsupport
LIBSUPPORT = $(SUPPORT)/libgdbsupport.a
-INCSUPPORT = -I$(srcdir)/.. -I..
+INCSUPPORT = \
+ -I$(srcdir)/.. \
+ -I..
#
# CLI sub directory definitons
@@ -601,8 +603,12 @@ 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)/config \
- -DLOCALEDIR="\"$(localedir)\"" $(DEFS)
+GDB_CFLAGS = \
+ -I. \
+ -I$(srcdir) \
+ -I$(srcdir)/config \
+ -DLOCALEDIR="\"$(localedir)\"" \
+ $(DEFS)
# MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory.
GLOBAL_CFLAGS = $(MH_CFLAGS)
@@ -626,12 +632,27 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \
# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
INTERNAL_CFLAGS_BASE = \
- $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
- $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(BFD_CFLAGS) $(INCLUDE_CFLAGS) \
- $(READLINE_CFLAGS) $(ZLIBINC) $(ZSTD_CFLAGS) $(LIBDECNUMBER_CFLAGS) \
- $(INTL_CFLAGS) $(INCGNU) $(INCSUPPORT) $(LIBBACKTRACE_INC) \
- $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) $(SRCHIGH_CFLAGS) \
- $(TOP_CFLAGS) $(PTHREAD_CFLAGS) $(DEBUGINFOD_CFLAGS) $(GMPINC) \
+ $(GLOBAL_CFLAGS) \
+ $(PROFILE_CFLAGS) \
+ $(GDB_CFLAGS) \
+ $(OPCODES_CFLAGS) \
+ $(BFD_CFLAGS) \
+ $(INCLUDE_CFLAGS) \
+ $(READLINE_CFLAGS) \
+ $(ZLIBINC) \
+ $(ZSTD_CFLAGS) \
+ $(LIBDECNUMBER_CFLAGS) \
+ $(INTL_CFLAGS) \
+ $(INCGNU) \
+ $(INCSUPPORT) \
+ $(LIBBACKTRACE_INC) \
+ $(ENABLE_CFLAGS) \
+ $(INTERNAL_CPPFLAGS) \
+ $(SRCHIGH_CFLAGS) \
+ $(TOP_CFLAGS) \
+ $(PTHREAD_CFLAGS) \
+ $(DEBUGINFOD_CFLAGS) \
+ $(GMPINC) \
$(AMD_DBGAPI_CFLAGS)
INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index c7120895a26..3aa7aa760ea 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -114,7 +114,9 @@ INTL = @LIBINTL@
INTL_DEPS = @LIBINTL_DEP@
INTL_CFLAGS = @INCINTL@
-INCSUPPORT = -I$(srcdir)/.. -I..
+INCSUPPORT = \
+ -I$(srcdir)/.. \
+ -I..
# All the includes used for CFLAGS and for lint.
# -I. for config files.
@@ -125,9 +127,15 @@ INCSUPPORT = -I$(srcdir)/.. -I..
# in those directories should be included with the subdirectory.
# e.g.: "target/wait.h".
#
-INCLUDE_CFLAGS = -I. -I${srcdir} \
- -I$(srcdir)/../gdb/regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \
- -I$(srcdir)/../gdb $(INCGNU) $(INCSUPPORT) \
+INCLUDE_CFLAGS = \
+ -I. \
+ -I${srcdir} \
+ -I$(srcdir)/../gdb/regformats \
+ -I$(srcdir)/.. \
+ -I$(INCLUDE_DIR) \
+ -I$(srcdir)/../gdb \
+ $(INCGNU) \
+ $(INCSUPPORT) \
$(INTL_CFLAGS)
# M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS
@@ -155,10 +163,21 @@ WIN32APILIBS = @WIN32APILIBS@
MAYBE_LIBICONV = @MAYBE_LIBICONV@
# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \
- ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS)
-INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
+INTERNAL_CFLAGS_BASE = \
+ ${GLOBAL_CFLAGS} \
+ ${PROFILE_CFLAGS} \
+ ${INCLUDE_CFLAGS} \
+ ${CPPFLAGS} \
+ $(PTHREAD_CFLAGS)
+
+INTERNAL_WARN_CFLAGS = \
+ ${INTERNAL_CFLAGS_BASE} \
+ $(WARN_CFLAGS)
+
+INTERNAL_CFLAGS = \
+ ${INTERNAL_WARN_CFLAGS} \
+ $(WERROR_CFLAGS) \
+ -DGDBSERVER
# LDFLAGS is specifically reserved for setting from the command line
# when running make.
@@ -472,17 +491,24 @@ MAKEOVERRIDES =
regdat_sh = $(srcdir)/../gdb/regformats/regdat.sh
-UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION
+UST_CFLAGS = \
+ $(ustinc) \
+ -DCONFIG_UST_GDB_INTEGRATION
# Undo gnulib replacements for the IPA shared library build.
# The gnulib headers are still needed, but gnulib is not linked
# into the IPA lib so replacement apis don't work.
-UNDO_GNULIB_CFLAGS = -Drpl_strerror_r=strerror_r -Drpl_free=free \
- -Drpl_malloc=malloc -Drpl_realloc=realloc
+UNDO_GNULIB_CFLAGS = \
+ -Drpl_strerror_r=strerror_r \
+ -Drpl_free=free \
+ -Drpl_malloc=malloc \
+ -Drpl_realloc=realloc
# Note, we only build the IPA if -fvisibility=hidden is supported in
# the first place.
-IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \
+IPAGENT_CFLAGS = \
+ $(INTERNAL_CFLAGS) \
+ $(UST_CFLAGS) \
$(UNDO_GNULIB_CFLAGS) \
-fPIC -DIN_PROCESS_AGENT \
-fvisibility=hidden
diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am
index 88414b4c927..7c360aa413e 100644
--- a/gdbsupport/Makefile.am
+++ b/gdbsupport/Makefile.am
@@ -25,10 +25,17 @@ ACLOCAL_AMFLAGS = -I . -I ../config
# ZW_GNU_GETTEXT_SISTER_DIR, but doesn't have any translations (currently).
SUBDIRS =
-AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../gdb \
- -I../gnulib/import -I$(srcdir)/../gnulib/import \
- -I.. -I$(srcdir)/.. $(INCINTL) -I../bfd -I$(srcdir)/../bfd \
- @LARGEFILE_CPPFLAGS@
+AM_CPPFLAGS = \
+ -I$(srcdir)/../include \
+ -I$(srcdir)/../gdb \
+ -I../gnulib/import \
+ -I$(srcdir)/../gnulib/import \
+ -I.. \
+ -I$(srcdir)/.. \
+ $(INCINTL) \
+ -I../bfd \
+ -I$(srcdir)/../bfd \
+ @LARGEFILE_CPPFLAGS@
override CXX += $(CXX_DIALECT)
diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index 6f8dacc157f..ab35b9148a5 100644
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -393,10 +393,17 @@ ACLOCAL_AMFLAGS = -I . -I ../config
# from Automake, as gdbsupport uses AM_GNU_GETTEXT through
# ZW_GNU_GETTEXT_SISTER_DIR, but doesn't have any translations (currently).
SUBDIRS =
-AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../gdb \
- -I../gnulib/import -I$(srcdir)/../gnulib/import \
- -I.. -I$(srcdir)/.. $(INCINTL) -I../bfd -I$(srcdir)/../bfd \
- @LARGEFILE_CPPFLAGS@
+AM_CPPFLAGS = \
+ -I$(srcdir)/../include \
+ -I$(srcdir)/../gdb \
+ -I../gnulib/import \
+ -I$(srcdir)/../gnulib/import \
+ -I.. \
+ -I$(srcdir)/.. \
+ $(INCINTL) \
+ -I../bfd \
+ -I$(srcdir)/../bfd \
+ @LARGEFILE_CPPFLAGS@
AM_CXXFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
noinst_LIBRARIES = libgdbsupport.a
reply other threads:[~2024-03-27 1:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240327011423.E9F443858C36@sourceware.org \
--to=simark@sourceware.org \
--cc=gdb-cvs@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).