From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Xw+vBhqe+GUUrgwAWB0awg (envelope-from ) for ; Mon, 18 Mar 2024 16:03:38 -0400 Received: by simark.ca (Postfix, from userid 112) id 0955C1E0C0; Mon, 18 Mar 2024 16:03:38 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E74011E08C for ; Mon, 18 Mar 2024 16:03:35 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8B509385842A for ; Mon, 18 Mar 2024 20:03:35 +0000 (GMT) Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 13FF73858C5F for ; Mon, 18 Mar 2024 20:03:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 13FF73858C5F Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 13FF73858C5F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710792190; cv=none; b=QafLvBcBq2Yw24WaaI6ecyMGEo2Mt4HG+uYvkxuCi38oY7vmTEoBkSCJNs2KDAeeEOaCp9Vk470CZxTW1ynWCTgtX5bG58eBtdBcHd7mhoDPPccm/h3aGw7UX5z8elDpQni4wL6pNeyFK4UcAWntWQ7yxtD8zGBVqtUeiioGOJs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710792190; c=relaxed/simple; bh=B5EWvAGwufa7LgCi/R7Uyc7Eb9YNTx4+eztdGw3sLvU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=UqfimT88LscmENDsG/gU0VuKmLw271y03xnt9duttE/Wqk8z6z6zbohwGx1HZQO24CoUWwkfFPm9QwPis3H6Nlu5T9jxQdSBX7SiWfA0ilNK22Uc5Dp3CjhDUT9XCO6xX5L3sTZCszeF0BKJNuJf4nUsaOeJUNjd+aAl4zAU/jk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id B50881E08C; Mon, 18 Mar 2024 16:02:58 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/3] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line Date: Mon, 18 Mar 2024 16:01:38 -0400 Message-ID: <20240318200257.131199-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1173.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Reformat some variables that the subsequent patches are going to touch. I think it makes them easier to read, and it also makes diffs clearer. Change-Id: I82f63ba0e6d0fe268eb1f1ad5ab22c3cd016ab02 --- gdb/Makefile.in | 8 ++++++-- gdbserver/Makefile.in | 12 +++++++++--- gdbsupport/Makefile.am | 15 +++++++++++---- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 331620375aed..95709ae395a2 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -601,8 +601,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) diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index c7120895a26d..c17a0a522df2 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -125,9 +125,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 diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am index 88414b4c927a..7c360aa413ef 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) base-commit: 0273b5967e21404d0442273b189b0e275cfafa74 -- 2.44.0