From patchwork Wed Jan 3 06:21:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83195 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1E920385C413 for ; Wed, 3 Jan 2024 06:22:19 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 0506F385782B for ; Wed, 3 Jan 2024 06:21:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0506F385782B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0506F385782B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704262900; cv=none; b=Bxa7kBSWMMgvt/Uugvsy3Gn/vwKQmPR5WNuaBmguLn0srfW/GGI+6DAo0gxZW/6oI/YzuE7ankQ8h7cM5bY4zNRxRQAqS+wq/xrP0LyYyu7wktU7vZEvS9WSWZNUROxEeDiV6i1GYQugrdoKsAHFe5cxT5dUZ/EBzHJmwQLFH6I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704262900; c=relaxed/simple; bh=EZystppXugaZIiU+Fs3zcutOTfHZ/F1PVmmv0tp/VU0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=w1jesX9k7Ixgt/K7RWDtuD99TKNn+zNfkAj8Nj4cnsBoY2XDg+tUnaT4QHnf26OnQJ14/wtFGZVb+oN0vssZyGJcKMG8V0FXaLyx7sEGQQVbDEAAkObbyUNxBdOYCKzjp+Xn83/exPEcN/oH0m9HamBDhWVs2IHlnlKo4+PhLxY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 908B934076D; Wed, 3 Jan 2024 06:21:38 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed 3/5] sim: drop support for automatic subdir recursion Date: Wed, 3 Jan 2024 01:21:30 -0500 Message-ID: <20240103062132.24338-3-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240103062132.24338-1-vapier@gentoo.org> References: <20240103062132.24338-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, 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+patchwork=sourceware.org@sourceware.org No port relies on this anymore, so we can scrub it all. --- sim/Makefile.am | 10 --- sim/Makefile.in | 154 +++++++++++++---------------------------------- sim/configure | 8 +-- sim/configure.ac | 3 - 4 files changed, 44 insertions(+), 131 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index b42926070dbd..9183b349725e 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -24,8 +24,6 @@ GNULIB_PARENT_DIR = .. srccom = $(srcdir)/common srcroot = $(srcdir)/.. -SUBDIRS = @subdirs@ - SIM_PRIMARY_TARGET = @SIM_PRIMARY_TARGET@ ## We don't set some of these vars here, but we need to define them so they may @@ -72,9 +70,6 @@ AM_CPPFLAGS_FOR_BUILD = \ COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ -## Deps to add to the all-recursive target. These are built before descending -## into any subdirs. -SIM_ALL_RECURSIVE_DEPS = ## Deps to add to the install-data-local target. SIM_INSTALL_DATA_LOCAL_DEPS = ## Deps to add to the install-exec-local target. @@ -205,11 +200,6 @@ if SIM_ENABLE_ARCH_v850 include v850/local.mk endif -## Helper targets for running make from the top-level when some subdirs still -## have Makefiles in subdirs. - -all-recursive: $(SIM_ALL_RECURSIVE_DEPS) - install-data-local: installdirs $(SIM_INSTALL_DATA_LOCAL_DEPS) $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(libdir) lib=`echo sim | sed '$(program_transform_name)'`; \ diff --git a/sim/configure.ac b/sim/configure.ac index cd84040945b7..937571a9957d 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -86,9 +86,6 @@ m4_define([SIM_TARGET], [dnl AM_CONDITIONAL([SIM_ENABLE_ARCH_$2], [${sim_enable_arch_$2}]) ]) -subdirs="" -AC_SUBST(subdirs) - dnl WHEN ADDING ENTRIES TO THIS MATRIX: dnl Make sure that the left side always has two dashes. Otherwise you can get dnl spurious matches. Even for unambiguous cases, do this as a convention, else