From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id E8A3A4CBB9 for ; Tue, 27 May 2025 21:41:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 051B468D9B7; Wed, 28 May 2025 00:41:48 +0300 (EEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 5621368A0C3 for ; Wed, 28 May 2025 00:41:41 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-742c46611b6so4331638b3a.1 for ; Tue, 27 May 2025 14:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748382100; x=1748986900; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=Yk/QZrZlXYdkSfEAiPvHOEM7F+PZ/ZJ1J3SPIA13WgE=; b=CAml8rfDaZ0iOSFpBkFg705p5tnfut3bW7oGWosoWyM+Bt5jyswkX6B6kDQn4TZUHF KOqTueTjvePV6zbYHHr5uWKzDZQuRkhQxZLhJb+aLodVsod+vcv4HZTBIkghkoV5BZje i0EFd4zvuEMmVwQOwSop7iAfO8zwP2dyi7TEkgooO3CySfcMLWMn5gai1jNOY+U4mJaM mTm2d3pCMwpcMHDbscQYfC2Nltu/nj117t8HwuZGnw0zMLJeYWeczhZEDQCXg2N0K4Bz HPY5bXpmQTlFcahQKgyxdOJ3akek0p1PYTCo2+8yP761CDMPu9IO78eUPJIFWpSrlsw4 tNJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748382100; x=1748986900; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Yk/QZrZlXYdkSfEAiPvHOEM7F+PZ/ZJ1J3SPIA13WgE=; b=YTuidUBDzlO+Ne/jNxQPP5rsBA6JhQPIdSu4a5eRooQOZG++LAjPIj5Fvzl1A7kkme WJn5tRCsvY3e85D1dDCKyTRJ57OQtpNMjvo4mR0O1idZZFiP74gb6QGK/LqAaDsJ4Eli tsM0P7PiJZDpb0OLUiVryHbz5EpFJWPZehccw15LjzYFaSSJyfMMgy30m2gLdSmFCNQh 5bei8RJFRYu+lz+UU6mvwYr4OI8WcZs+zIroYHP5qGkK+lBKSgReYYcWVYXYgDpk9FMh 73bcTHIZ76vLB7Ra7j+d+QMo6cLC6f0sRQ2xfqso7IjTuKPK1fUIzxH/cSjCXx1kadNA nueQ== X-Gm-Message-State: AOJu0YwzOAx/D4bGG1rgqZ/BU2vmUV5TOXa9PbyTkzLupXNFwGp01Kg4 zaflXimt+qNlAtqgxIJWZ2/zoyr6ejlgR555DrzGQ2sVQ7ioffR+bGRD0m5Tfw== X-Gm-Gg: ASbGnct+IzJjIjiOgVYxNxkmKE0hyqYQXjnD5N4vcZXBOxWJOkZ12Kd6QM9APjZNiMo a6hXqXqGN0pv5j1lSbSkSFVwQ1TEcV3MBWVIrErXylgZnnucf3dimpTSRG/xAg+z87In028Bqvb tS79/SmM/XysP8VWSeC6WaYITtJzk4gFsXVlEYnrvt5QeWVhiEly756XY0mK2Y11gBohK1t2BkT 8tH4HeUo8FzTewfdBt1beDr5775HcdCRPowL4Rh1APNWzFs5W9xPvO/PHW5bphqXIJYJXLp6TCa pbh9jpEQwSgkW0HnAerVf9PXN1nts2hKY8aLjbRrggZ7dSjR8R9Le4qQKutbu8Vz+molBw== X-Google-Smtp-Source: AGHT+IH8WPKG5EgFTbiZqneHUDL5XG/43oIOULjGF3gF00oqmcONoHg0/v7PnH6TCmHc7dtRu/3F0A== X-Received: by 2002:a05:6a00:22cd:b0:736:3be3:3d76 with SMTP id d2e1a72fcca58-745fe064577mr18598053b3a.17.1748382099520; Tue, 27 May 2025 14:41:39 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7465e6484f4sm58560b3a.32.2025.05.27.14.41.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 May 2025 14:41:39 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <20c2fb65edbbd5c0084e50026e38bdcd2bd4cad4.1748382088.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Tue, 27 May 2025 21:41:26 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 1/2] ffbuild/commonmak: Fix rebuild check with implicit rule chains X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: softworkz When there's a chain of implicit rules, make treats files generated inside that chain as intermediate files. Those intermediate files are removed after completion of make. When make is run again, it normally determines the need for a rebuild by comparing the timestamps of the original source file and the final output of the chain and if still up-to-date, it doesn't rebuild, even when the intermediate files are not present. That makes sense of course - why would it delete them otherwise, it would end up in builds being never up-to-date. But this original by-the-book logic appeared to be broken and has been worked around by adding all intermediate files to the .SECONDARY special target, which required extra logic and issues with make clean. What broke the up-to-date checking is the dependency file generation. For the .c files generated by BIN2C the compile target created a .d file which indicated that the .ptx.o file has a dependency on the ptx.c file. And that dependency broke the normal make behavior with intermediate files. This patch compiles the BIN2C generated .c files without generating .d files. In turn the files do not longer need to be added to the .SECONDARY target in common.mak. When interested in those files for debugging, a line can be added to the corresponding Makefile like .SECONDARY: %.ptx.c %.ptx.gz Signed-off-by: softworkz --- ffbuild/common.mak | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 0e1eb1f62b..f03b9ca051 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -139,6 +139,10 @@ else $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) endif +%.ptx.o: CCDEP = +%.ptx.o: CC_DEPFLAGS = + + # 1) Preprocess CSS to a minified version %.css.min: %.css # Must start with a tab in the real Makefile @@ -177,6 +181,10 @@ else # NO COMPRESSION $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) endif +%.html.o %.css.o: CCDEP = +%.html.o %.css.o: CC_DEPFLAGS = + + clean:: $(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%) @@ -229,10 +237,9 @@ SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o)) PTXOBJS = $(filter %.ptx.o,$(OBJS)) -RESOURCEOBJS = $(filter %.css.o %.html.o,$(OBJS)) $(HOBJS): CCFLAGS += $(CFLAGS_HEADERS) checkheaders: $(HOBJS) -.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:%.css.o=%.css.min) $(RESOURCEOBJS:%.css.o=%.css.min.gz) $(RESOURCEOBJS:%.html.o=%.html.gz) $(RESOURCEOBJS:.o=) +.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=) alltools: $(TOOLS) -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".