From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kr13O+5W2mkgPBIAWB0awg (envelope-from ) for ; Sat, 11 Apr 2026 10:13:02 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=monnerat.net header.i=@monnerat.net header.a=rsa-sha256 header.s=mnet header.b=y2G1mL/c; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id CA3AD1E0BC; Sat, 11 Apr 2026 10:13:02 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 1655B1E04F for ; Sat, 11 Apr 2026 10:13:01 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id DEC584BA23F3 for ; Sat, 11 Apr 2026 14:12:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DEC584BA23F3 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=monnerat.net header.i=@monnerat.net header.a=rsa-sha256 header.s=mnet header.b=y2G1mL/c Received: from jupiter.monnerat.net (jupiter.monnerat.net [46.226.111.226]) by sourceware.org (Postfix) with ESMTPS id 48A464BA23D4 for ; Sat, 11 Apr 2026 14:12:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 48A464BA23D4 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=monnerat.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=monnerat.net ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 48A464BA23D4 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=46.226.111.226 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1775916756; cv=none; b=nCcKqkNxM240WyG33g1fojeZ0Y0fW4HsYlUkyU99kLU5s/5UuPYNdygfkwXUm1fFTFLaqCfKwUXb/4x5hidq5A3HQVPn6NO+XY9yGLur4EX35G8dENfobtr5mXxMTUAWlfpcrV08GOw4L7QpaLFZckmQHRnfJYwCYMATCUFsj4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1775916756; c=relaxed/simple; bh=hpuyYJuLW371KUiz3xT1LUcUhRGJ2q7mpdmL5igvrrc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=fDnjJsfRPCgJvQNirMqwKV/D66Si4CR+Z/1kgGoIRbzmqkWBmodUUnd2/jb9q/Y1ljXkvTGbQYazadl/sVMF/gk29p+pNxLTl95kuGyBHtUAIPl/2U2oAttFa0fRDoKCLlOLn8dtw8LaPgNwdthmjG/TSDX97bsJaaMZTLPjilE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 48A464BA23D4 Received: from patrick.monnerat ([192.168.0.128]) by jupiter.monnerat.net (8.14.8/8.14.8) with ESMTP id 63BECPL0027088 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 11 Apr 2026 16:12:31 +0200 DKIM-Filter: OpenDKIM Filter v2.10.3 jupiter.monnerat.net 63BECPL0027088 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=monnerat.net; s=mnet; t=1775916751; bh=hpuyYJuLW371KUiz3xT1LUcUhRGJ2q7mpdmL5igvrrc=; h=From:To:Cc:Subject:Date:From; b=y2G1mL/cfnt04/Qzsayc/ai4vgG1nXKx/8LQYvlZW35coLhH5fBnBh+jmreYdyLhV 92l3KTNg88kWOiBc18nGnMOOq2nBmg+6LUFLrl6uAyKr1Gf/vbPCjwC4hbsJGCwwIQ rTUIbr2/E15K6EHBoD3LaJj4ldQIsTJlnhOjxG94= From: Patrick Monnerat To: gdb-patches@sourceware.org Cc: Patrick Monnerat Subject: [PUSHED] gdb: store gdbtk object files into their sources directory Date: Sat, 11 Apr 2026 16:11:09 +0200 Message-ID: <20260411141108.78765-2-patrick@monnerat.net> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Do not list gdbtk required object file names, but generates them from source file names. Use gdb object file list rather than static library for linking insight. --- gdb/Makefile.in | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 81a601dc448..b235edf6356 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -559,29 +559,19 @@ GDBTK_LIBRARY = $(datadir)/insight$(GDBTK_VERSION) # the testsuite won't run properly. GDBTK_SRC_DIR = @GDBTK_SRC_DIR@ -SUBDIR_GDBTK_OBS = \ - gdbtk.o \ - gdbtk-bp.o \ - gdbtk-cmds.o \ - gdbtk-hooks.o \ - gdbtk-interp.o \ - gdbtk-register.o \ - gdbtk-stack.o \ - gdbtk-varobj.o \ - gdbtk-wrapper.o - SUBDIR_GDBTK_SRCS = \ gdbtk/generic/gdbtk.c \ gdbtk/generic/gdbtk-bp.c \ gdbtk/generic/gdbtk-cmds.c \ gdbtk/generic/gdbtk-hooks.c \ gdbtk/generic/gdbtk-interp.c \ - gdbtk/generic/gdbtk-main.c \ gdbtk/generic/gdbtk-register.c \ gdbtk/generic/gdbtk-stack.c \ gdbtk/generic/gdbtk-varobj.c \ gdbtk/generic/gdbtk-wrapper.c +SUBDIR_GDBTK_OBS = $(patsubst %.c,%.o,$(SUBDIR_GDBTK_SRCS)) + SUBDIR_GDBTK_DEPS = $(LIBGUI) $(TCL_DEPS) $(TK_DEPS) SUBDIR_GDBTK_LDFLAGS = SUBDIR_GDBTK_CFLAGS= -DGDBTK -D@TCL_PLATFORM_DEFINE@ -D@TK_PLATFORM_DEFINE@ @@ -599,7 +589,7 @@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ HAVE_GSTACK = @HAVE_GSTACK@ CONFIG_SRC_SUBDIR = arch cli dwarf2 mi compile tui unittests guile python \ - target nat + target nat gdbtk/generic CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -2110,10 +2100,8 @@ $(CONFIG_DEP_SUBDIR): # Python files need special flags. python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS) -# Rules for compiling .c files in the various source subdirectories. -%.o: $(srcdir)/gdbtk/generic/%.c - $(COMPILE) $(all_gdbtk_cflags) $< - $(POSTCOMPILE) +# Insight UI needs special flags. +gdbtk/generic/%.o: INTERNAL_CFLAGS += $(all_gdbtk_cflags) installcheck: @@ -2343,6 +2331,7 @@ uninstall: force $(CONFIG_UNINSTALL) # computing the list of source files from the list of object files. INIT_FILES_FILTER_OUT = \ + gdbres.o \ init.o \ version.o \ xml-builtin.o \ @@ -2824,10 +2813,10 @@ clean-gdbtk: rm -f insight$(EXEEXT) # Removing the old gdb first works better if it is running, at least on SunOS. -insight$(EXEEXT): gdbtk-main.o libgdb.a $(CDEPS) $(TDEPLIBS) - rm -f insight$(EXEEXT) +insight$(EXEEXT): gdbtk/generic/gdbtk-main.o $(LIBGDB_OBS) $(CDEPS) $(TDEPLIBS) + $(SILENCE) rm -f insight$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ - -o insight$(EXEEXT) gdbtk-main.o libgdb.a \ + -o insight$(EXEEXT) gdbtk/generic/gdbtk-main.o $(LIBGDB_OBS) \ $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico @@ -2862,7 +2851,7 @@ endif # A list of all the objects we might care about in this build, for # dependency tracking. -all_object_files = gdb.o $(LIBGDB_OBS) gdbtk-main.o +all_object_files = gdb.o $(LIBGDB_OBS) gdbtk/generic/gdbtk-main.o # All the .deps files to include. all_deps_files = $(foreach dep,$(patsubst %.o,%.Po,$(all_object_files)),\ -- 2.53.0