From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id E4AF73870849 for ; Sat, 11 May 2024 09:37:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E4AF73870849 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E4AF73870849 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715420245; cv=none; b=I9Ms3turMXq0YjkIqDKqDvt0R1OenrFfcr1CRI9hCmKsDPdeF+tle/W9rQmcKhfjpl5trD5BUwud0gAxUjNl/9DrwPbaUE8fqTjmbI11xtaw26UHBAJ/kUyW6exXSezb/GnNW8KcYALAJ6pCNMR0qLQTvwX6qUBuk1F99RboBa8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715420245; c=relaxed/simple; bh=huzHo9bLlCaKLJtlp4BnfEzeuLc+PgxJknCbhlMZRso=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=kAPYrRNEfiuk+bOG+F04L00ygOWUyylWhRUgjYgLZTbLj6EXUPf0vHJgGZe8MpoavtK/S44nfSkz1xtON0E4J34xporUiDbe5Q9I2qDekHMEVcCuzXzQq3vgHKJKgwwUh/WUQOAkAHrX0K9j3vrDk/zzTOxLVxjIJL57KFUkrnA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715420243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ioO4LagIW5yg2pJ808XHaBYqParB2PhcF60vWSpoP3I=; b=E6UkMVl80EVjAaio1VvcLyorUKGUZxyo7OFSEe8cUk4mglfO18YwQC2Cd6kW0MqgdV5eNz AFnJ/UjE4vRX9P1peUxUHhYyDipq46jQyN43WLeUrFe6Sl2VsGy0zBEasrKGOpQ4GiCrC9 b2AkTbrfNpDTnDqZt4jSzLGlHsa3usg= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-669-6aDfYcsUNNem6t1MO2IM8A-1; Sat, 11 May 2024 05:37:21 -0400 X-MC-Unique: 6aDfYcsUNNem6t1MO2IM8A-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-41fc5c5cc95so12702725e9.0 for ; Sat, 11 May 2024 02:37:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715420240; x=1716025040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ioO4LagIW5yg2pJ808XHaBYqParB2PhcF60vWSpoP3I=; b=wXrFtMnJ8qT6LJaovxeWsXTmXWWSKWQ8gNi7cWeyyd+QMxmjmxvDj48MtwSEiah74w HprwiVzg+A6y+xc7G/f4BM7BKgP9R1ZecXLwehSPstRu85HykNgEYU5z/V63NJVwd7eg wy5H6gmtxBfgDXstpZIjqlpOSWb9jtANspVG9TjXnEd+i02Oo3tBcFywNI2/vf53ebFk Rj4Xyja5T6fL2ZRUCNm8HGXNVyHLrXZsMSeolvojSkTOD4qf/s7jXwLihXcaPrqJbN1V 91U/uALs0LNJMz/kxHz7374D8kRChO1VefSeEd8uZcDVD5aCkwHRRUSCfBgbX2EkOyS5 tnxQ== X-Gm-Message-State: AOJu0YwvqqwpBuvtn0RpreXmDOaTAD1rv9gRp4JJXvmY2xkAfcSJQEBj 0G2snzBcFmVeyKJetkaOVbv4rdLrSNNLVEccGe/i1BdNtLn4PvhUhx7AKiO1AURPzPLw03qBq20 pEXfBw0bMOwyCwl8zqan23TBzRwviWrpARTYZAEZL/UOSJgQTh32FJ6Eu5gau6tZbG+8aFWqXzF 8JCL8z/6xasQEoQQIvifz983rfIoNS9n/HapY25ZbOMlQ= X-Received: by 2002:a1c:4b0a:0:b0:41f:dec3:d5d3 with SMTP id 5b1f17b1804b1-41feaa434b2mr48063155e9.19.1715420239990; Sat, 11 May 2024 02:37:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHffKBHb3aCLlue5BCt6jlqfeJw0NzeTvCgcGkDcIr8C0OC3BLuou9PXlT1VZa1skVkroxpBQ== X-Received: by 2002:a1c:4b0a:0:b0:41f:dec3:d5d3 with SMTP id 5b1f17b1804b1-41feaa434b2mr48062975e9.19.1715420239441; Sat, 11 May 2024 02:37:19 -0700 (PDT) Received: from localhost (92.40.185.101.threembb.co.uk. [92.40.185.101]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccce73f5sm94072755e9.21.2024.05.11.02.37.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 02:37:18 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 1/4] gdb/doc: don't delete *.pod files too early Date: Sat, 11 May 2024 10:37:09 +0100 Message-Id: <336dabc0e1d7482d28cb1629a07f56abc3491c74.1715420013.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-8.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_ABUSEAT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: When doing 'make -C gdb/doc man' to build the man pages, I noticed that the outputs were being rebuilt each time the make command was rerun, even when the input files hadn't changed. This was caused by this commit: commit 824083f34c222aa7419e2ea58e82d6f230d5f531 Date: Fri Apr 12 17:47:20 2024 +0100 gdb/doc: use silent-rules.mk in the Makefile Which split the generation of the .pod file from the actual creation of the man page file. Prior to this split it was OK to delete the .pod file at the end of the recipe, the rule depending on the .texi input file, and output was the .1 or .5 man page file. Now however, with the split, the man page creation depends on the .pod file, if we delete this after creating the .1 or .5 man page file then the next time we run 'make' the .pod file is missing and is regenerated, which in turn triggers the regeneration of the man page file. Fix this by leaving the .pod file around, and only cleaning up these files in the 'mostlyclean' target. Which leads to a second problem, the POD_FILE_TMPS is not created correctly, so we don't actually clean up the .pod files! This too is fixed in this commit. After this commit running 'make -C gdb/doc man' will build the manual pages the first time, and each subsequent run will do nothing. Running 'make -C gdb/doc mostlyclean' will now delete the .pod files. --- gdb/doc/Makefile.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 28d829fdfee..3f3fe7b7ed9 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -190,8 +190,8 @@ MANS = $(MAN1S) $(MAN5S) # The pod files that are generated as a side effect of creating the # man pages. -POD_FILE_TMPS = $(patsubst %.1,%.pod,$MAN1S) \ - $(patsubst %.5,%.pod,$MAN1S) +POD_FILE_TMPS = $(patsubst %.1,%.pod,$(MAN1S)) \ + $(patsubst %.5,%.pod,$(MAN5S)) HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@ @@ -665,12 +665,10 @@ annotate/index.html: $(ANNOTATE_DOC_FILES) $(MAN1S) : %.1 : %.pod $(GDB_DOC_FILES) $(ECHO_TEXI2MAN) ($(POD2MAN1) $*.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - $(SILENCE) rm -f $*.pod $(MAN5S) : %.5 : %.pod $(GDB_DOC_FILES) $(ECHO_TEXI2MAN) ($(POD2MAN1) $*.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - $(SILENCE) rm -f $*.pod force: -- 2.25.4