From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id E9F443858C36; Wed, 27 Mar 2024 01:14:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E9F443858C36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1711502063; bh=amb4TLUaEgLQWmeBwvs374+SPgzu15ttqVhuKTfZ3QQ=; h=From:To:Subject:Date:From; b=tmNf3yOoKfm+4StPsN3xgcoc4Zs7WCTr2bqEAHbW/7LktTR9fzUx+vEtM97Le9fvT L4lzico8+rqt8Q9dQDnk5QWfINnnzjxsNbG7+5Lvl3Xf1YQfiddycboy15sij7yXKQ Aua2UlVpTbTU/ZTKafE8/L643ACyoQtIR7ugQ54s= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: f61e97cc86a4003e4c731e356985fdd291d7cb69 X-Git-Newrev: 2f3dfa7f90806fe1bbaeb16d22d0740a5cde69a2 Message-Id: <20240327011423.E9F443858C36@sourceware.org> Date: Wed, 27 Mar 2024 01:14:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D2f3dfa7f9080= 6fe1bbaeb16d22d0740a5cde69a2 commit 2f3dfa7f90806fe1bbaeb16d22d0740a5cde69a2 Author: Simon Marchi Date: Tue Mar 26 15:06:43 2024 -0400 gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry= per line =20 Reformat some variables definitions. I think it makes them easier to read, and it also makes diffs clearer. =20 Change-Id: I82f63ba0e6d0fe268eb1f1ad5ab22c3cd016ab02 Approved-By: Pedro Alves 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=3D@LIBBACKTRACE_LIB@ =20 SUPPORT =3D ../gdbsupport LIBSUPPORT =3D $(SUPPORT)/libgdbsupport.a -INCSUPPORT =3D -I$(srcdir)/.. -I.. +INCSUPPORT =3D \ + -I$(srcdir)/.. \ + -I.. =20 # # CLI sub directory definitons @@ -601,8 +603,12 @@ CONFIG_DEP_SUBDIR =3D $(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 =3D @DEFS@ -GDB_CFLAGS =3D -I. -I$(srcdir) -I$(srcdir)/config \ - -DLOCALEDIR=3D"\"$(localedir)\"" $(DEFS) +GDB_CFLAGS =3D \ + -I. \ + -I$(srcdir) \ + -I$(srcdir)/config \ + -DLOCALEDIR=3D"\"$(localedir)\"" \ + $(DEFS) =20 # MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directo= ry. GLOBAL_CFLAGS =3D $(MH_CFLAGS) @@ -626,12 +632,27 @@ INTERNAL_CPPFLAGS =3D $(CPPFLAGS) @GUILE_CPPFLAGS@ @P= YTHON_CPPFLAGS@ \ =20 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. INTERNAL_CFLAGS_BASE =3D \ - $(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 =3D $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS) INTERNAL_CFLAGS =3D $(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 =3D @LIBINTL@ INTL_DEPS =3D @LIBINTL_DEP@ INTL_CFLAGS =3D @INCINTL@ =20 -INCSUPPORT =3D -I$(srcdir)/.. -I.. +INCSUPPORT =3D \ + -I$(srcdir)/.. \ + -I.. =20 # All the includes used for CFLAGS and for lint. # -I. for config files. @@ -125,9 +127,15 @@ INCSUPPORT =3D -I$(srcdir)/.. -I.. # in those directories should be included with the subdirectory. # e.g.: "target/wait.h". # -INCLUDE_CFLAGS =3D -I. -I${srcdir} \ - -I$(srcdir)/../gdb/regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \ - -I$(srcdir)/../gdb $(INCGNU) $(INCSUPPORT) \ +INCLUDE_CFLAGS =3D \ + -I. \ + -I${srcdir} \ + -I$(srcdir)/../gdb/regformats \ + -I$(srcdir)/.. \ + -I$(INCLUDE_DIR) \ + -I$(srcdir)/../gdb \ + $(INCGNU) \ + $(INCSUPPORT) \ $(INTL_CFLAGS) =20 # M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS @@ -155,10 +163,21 @@ WIN32APILIBS =3D @WIN32APILIBS@ MAYBE_LIBICONV =3D @MAYBE_LIBICONV@ =20 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS_BASE =3D ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) -INTERNAL_WARN_CFLAGS =3D ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS =3D ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_CFLAGS_BASE =3D \ + ${GLOBAL_CFLAGS} \ + ${PROFILE_CFLAGS} \ + ${INCLUDE_CFLAGS} \ + ${CPPFLAGS} \ + $(PTHREAD_CFLAGS) + +INTERNAL_WARN_CFLAGS =3D \ + ${INTERNAL_CFLAGS_BASE} \ + $(WARN_CFLAGS) + +INTERNAL_CFLAGS =3D \ + ${INTERNAL_WARN_CFLAGS} \ + $(WERROR_CFLAGS) \ + -DGDBSERVER =20 # LDFLAGS is specifically reserved for setting from the command line # when running make. @@ -472,17 +491,24 @@ MAKEOVERRIDES =3D =20 regdat_sh =3D $(srcdir)/../gdb/regformats/regdat.sh =20 -UST_CFLAGS =3D $(ustinc) -DCONFIG_UST_GDB_INTEGRATION +UST_CFLAGS =3D \ + $(ustinc) \ + -DCONFIG_UST_GDB_INTEGRATION =20 # 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 =3D -Drpl_strerror_r=3Dstrerror_r -Drpl_free=3Dfree \ - -Drpl_malloc=3Dmalloc -Drpl_realloc=3Drealloc +UNDO_GNULIB_CFLAGS =3D \ + -Drpl_strerror_r=3Dstrerror_r \ + -Drpl_free=3Dfree \ + -Drpl_malloc=3Dmalloc \ + -Drpl_realloc=3Drealloc =20 # Note, we only build the IPA if -fvisibility=3Dhidden is supported in # the first place. -IPAGENT_CFLAGS =3D $(INTERNAL_CFLAGS) $(UST_CFLAGS) \ +IPAGENT_CFLAGS =3D \ + $(INTERNAL_CFLAGS) \ + $(UST_CFLAGS) \ $(UNDO_GNULIB_CFLAGS) \ -fPIC -DIN_PROCESS_AGENT \ -fvisibility=3Dhidden 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 =3D -I . -I ../config # ZW_GNU_GETTEXT_SISTER_DIR, but doesn't have any translations (currently). SUBDIRS =3D =20 -AM_CPPFLAGS =3D -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 =3D \ + -I$(srcdir)/../include \ + -I$(srcdir)/../gdb \ + -I../gnulib/import \ + -I$(srcdir)/../gnulib/import \ + -I.. \ + -I$(srcdir)/.. \ + $(INCINTL) \ + -I../bfd \ + -I$(srcdir)/../bfd \ + @LARGEFILE_CPPFLAGS@ =20 override CXX +=3D $(CXX_DIALECT) =20 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 =3D -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 =3D=20 -AM_CPPFLAGS =3D -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 =3D \ + -I$(srcdir)/../include \ + -I$(srcdir)/../gdb \ + -I../gnulib/import \ + -I$(srcdir)/../gnulib/import \ + -I.. \ + -I$(srcdir)/.. \ + $(INCINTL) \ + -I../bfd \ + -I$(srcdir)/../bfd \ + @LARGEFILE_CPPFLAGS@ =20 AM_CXXFLAGS =3D $(WARN_CFLAGS) $(WERROR_CFLAGS) noinst_LIBRARIES =3D libgdbsupport.a