[v3,1/4] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line
Checks
Commit Message
Reformat some variables definitions. I think it makes them easier to
read, and it also makes diffs clearer.
Change-Id: I82f63ba0e6d0fe268eb1f1ad5ab22c3cd016ab02
---
gdb/Makefile.in | 39 ++++++++++++++++++++++++--------
gdbserver/Makefile.in | 50 ++++++++++++++++++++++++++++++++----------
gdbsupport/Makefile.am | 15 +++++++++----
gdbsupport/Makefile.in | 15 +++++++++----
4 files changed, 90 insertions(+), 29 deletions(-)
@@ -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)
@@ -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
@@ -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)
@@ -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