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 229BD4C8C9 for ; Tue, 27 May 2025 01:48:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id CA68568CF18; Tue, 27 May 2025 04:48:18 +0300 (EEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02olkn2024.outbound.protection.outlook.com [40.92.15.24]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C490D68C967 for ; Tue, 27 May 2025 04:48:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yDLoVjw+KhZLDWXOCIUYey/duIbQ3t+NqIr+b1CxvPeC7ychJwn1lZl8x1sNNioNN6b42qsy75B/YI4DbTNYHpp/Bwf5kir5AHqgrvxDhql9ViTG9BUyKumabVEMzU+C8j6MgSHJkAgOxFwWCc0e6fuSDq798r+dfb4FvpBNwO5H/PvlWaDDIT6261kx5zZd0AYWZ4v1TKAvFipdm7lQ+lapLIPV63tgIm5IGSg8UpGVgsqXb3XLWVt5E5Hk+M3Qv4aisMQu5OoRwlPPmYdnS6ajWs+PaxL5rP7vt8ND0nOJYDfT12StaVlw2VZ3BhT9dL9JfAJUBmc/27ly2qoySg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=recbxFfffTq52j374nxK5GCMZ0Hi9M5L3fx/qyxq9nM=; b=QNzg0CIc/N3TthbqmnM1ajDwlThVREJdpNgGthhDnj2PWOfriaN2AwAmpByKXbALY9zeaA3LUMwB4zockMiC2zQ5Uh+YekKwXVvimPApOQ/IcmIVl8fedcXsJLb3QhVD5bK2AkVASrhnmK8pB7N7C4Z00PB9J9KNUCXxHB3q5as/Z/aSpHKvIlnYInaNwWMm5mxp35udc0QAaHg/dhUHEKzlQcBuJ8MENnGWyNunzdRjMLi+K8W+DufNKAjTGHLo+JlOqPJVmBHhkIb4xj2mqsxqFBiqCA9jNGdzyibqQsc3s6/stJa4dFNqmaaGOYd0NQBEdegcifItT1SwZ87zvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=recbxFfffTq52j374nxK5GCMZ0Hi9M5L3fx/qyxq9nM=; b=rOATP71RMWM1OZGadqJXzrA6vyRFut0ZJYNQL95MKaLSEVm6eyB6Az4bl3nfxd3i4dklk06qt7mBXw0jnL01S78LVcCJPqrUTTttLK1nmhM2uJPsQwF0VUZq1xI0e7Mj+/XvNyKO4VVhfvnE8qiiTGnDCXmyM/h4lLGo25d3yGN8X2AbJOCCt9IziDxAfm+//yYWL3CmEejjHtCkzttuS2dONzDQ23sbFUMZx8wEs5ZBBVc5cqK6Abyxb+HNJ8IrDSWm5dj0i2NZ8Kj2rBxnBDZxGrOODYJD/J3V/YZvhFrXE9UjXQo9V6uDZ4TTUL0qnpDk7ITIhe49Z9Whx/a3GA== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by IA3P223MB1744.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:582::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.32; Tue, 27 May 2025 01:48:08 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::bf09:8e9:b07f:98a7]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::bf09:8e9:b07f:98a7%4]) with mapi id 15.20.8769.025; Tue, 27 May 2025 01:48:08 +0000 From: "softworkz ." To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH 4/5] ffbuild/common.mak: clean up and move fftools/resources-specific code its Makefile Thread-Index: AQHbzqd6e9yhnRVeFE+HzGul0w/ojLPltMxw Date: Tue, 27 May 2025 01:48:08 +0000 Message-ID: References: <20250527013328.308477-1-ramiro.polla@gmail.com> <20250527013328.308477-4-ramiro.polla@gmail.com> In-Reply-To: <20250527013328.308477-4-ramiro.polla@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM8P223MB0365:EE_|IA3P223MB1744:EE_ x-ms-office365-filtering-correlation-id: dbf324db-b8fa-4217-f303-08dd9cc0880c x-ms-exchange-slblob-mailprops: obhAqMD0nT+76ZruCrigLPUIQMEMZUn+N/zbv49IM2xyUgtfEY5D0igGLemjLvJfgmuiIWcZ4WDy//bVHYfdOdXz72+/isQ25eYFNi6t+7Ii8CdJOn7EMjEBZXczvtUBk4gdWAfg8USdkPrkeeAk6hwzuX5OnYmtYiEvxD1aid33zBYRICZFfPKxbR52cc1gSJUPQPsn5v8InXPMHO+/wWdmntYsNusJORKTVtUqYTkgvJRzADsCmuYYBjj6hTUEMWLr6yJzqkICjhMJPhL+o66xdNTHveTkm8xJMDYBXvArqTcvioWkOuaAHmmwNcgkGGuw7ogzIEG4oe1GoWHdS5RNoZ4CkzoIIlXmK2pEwkp3DTVkzJLtBQzZT7fxphenmCZnhFzcFJeFB8LthwLn6E2HomXGe7wndv1pBvw80GAdf+DisVHzNWLsACiwC9dI4YuwNiYDIDCGNWSrND+r5AyZ4XPgY9HfwAxn81SAN2m4t74XlmzkxZmT7WsPdDUtqXsei4OGxg+hHOv12N4WpCOPunbKRVDTDxTBnDH2Aw7Kw5r29A6Q3Fbm/h/IBPqzpFpg6Yc4wy3kSHjnlvvj66Qv2ciDledMsQ+v3GRHxa3QYKZ5ViCeLowtWrpT2YG9wxqN6FB1LMNOmUfZMrANbv+Z3W/3Cy6RusG/jUpcm/QSmES8xJIyeSO0+E5DyCWQm9dOQaWtnrZ0eUihl+M1cFcGiME9B6PRKwg/QIElg/+u1qdPg2C6dDA6m1W/KgMsKzRoDHmaTp1DKUNSPInRCAQ5nFLDuGs2flc0r5z+4VT0XYCGIIvh28n9+xa6uJjw x-microsoft-antispam: BCL:0; ARA:14566002|19110799006|15080799009|8060799009|8062599006|7092599006|461199028|3412199025|440099028|4302099013|10035399007|102099032|1602099012; x-microsoft-antispam-message-info: =?us-ascii?Q?YJUaFwDRgJlgaSMFDLpkR6tlvh+imqHOkvxF2YSlq4FtjWi2fKRblxJX7eh2?= =?us-ascii?Q?w51LNxwA+p9wE7iMFMOa13Ya+w3nRC1cd/Fmh8K91OY7tY2Wsvh0XzgbbbXU?= =?us-ascii?Q?99lqBRRKScGqQy6F5qqL0vAtNcBPCXS3iWdsF1lPsted6S3OJfkIRUWGLSn2?= =?us-ascii?Q?4tb3bQCGFCPDlGS5zHxumvAM0VMI4bKEIttNITES5ndiu3bxF4J2YpZMCyo7?= =?us-ascii?Q?MMQiy78essMxZea7b5jtvKOzRQMAFvUnBMH3JPztn40ff/fi/Uxzvg3VxWy2?= =?us-ascii?Q?hdnW0TkYbX6rNYAO8VW9QeDNAd9/vm18X1Es0/XEbPhb+9K9DkkzXqEx2z/2?= =?us-ascii?Q?HmJtQJ9fvy6Bu9bf4xmq9ITpYO1HRgdQBR0pzHDD+erGuWFvgKOSQbTUN255?= =?us-ascii?Q?5Swy9xtY9bwGeDNIRpM4JEDPRFgeNcaQdafM6zhYsRE5NRVUjjimIa25UYs6?= =?us-ascii?Q?mLAH1rfbevqIidX0JovFxf0sDuImc0u1v9fzYzgZDr5q826h0B9WwE9iGFPp?= =?us-ascii?Q?zizLiEK+Oqu+6BJLiBj0dB6oU/ZSpNs1Sj700zh0p2JUhbJeV7o6SIgESiIk?= =?us-ascii?Q?fSI1qekXh7kqwHhRWCVBIa1301qfEx2lazUVmNYfHjIL718s9Cg8iSCE7jsO?= =?us-ascii?Q?5ZhJT7PSFDp19fSr1GOoLfdnJiDKeYzld6+m1/O56XHzeHTFkBa9IvW2F4Nd?= =?us-ascii?Q?J7nrGgpcvO+nRCexpV5yHhbbfCpAVJfBSx1He+UchzF5vi+3vp0+sBH3bO52?= =?us-ascii?Q?54SizxZscO4CUx41cuvfXZHsMpz9OgGaYrD6/JZ+THcYxwRa5Zw6MK3dZoVv?= =?us-ascii?Q?oI/2wKDMfgMmNEEZ5Aftw8XSCnlmucnsHxFpX0ArqyGe4LNJvY8JuL3mchYx?= =?us-ascii?Q?8uHnlps1w/tnQ6Tzbj2OU/HflB/AUetQ3G+rxpnDMoBMwQsKfC1pOmd9wd9j?= =?us-ascii?Q?vg9TjyLOrhvrojvnZIPHcj2/X+jY0NvTgUmRgFV3a1rtAC59E2ViNZP5ebx2?= =?us-ascii?Q?A41uBaLRUgXFZW5QQNOgvchNRH7m9zXZrhTbzXmh3NEDXNr4y2mZvce9fuWg?= =?us-ascii?Q?3i5ni3jEOGt3RZB10Wv+/pNGZOJXGX5kKOF+EgZn5DVtyvvoCeaw/P6HxlkJ?= =?us-ascii?Q?ptNOxDdSV030vo3ntJ+6tdR4K6qH3QOBNCCZQmD3Je//W2OW5ZcKAHsVYmkK?= =?us-ascii?Q?fb5792wWP/G+8vJ1Ye0Oeq3/GDr6lSFNtD/25w=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?LH44dojAcwGzmfz/R87RrGfvS6qjyg4XRuEz4NUJj2D84QOqW7c8wK1Wr1B0?= =?us-ascii?Q?vggWtU0FFc7DZtroX9QjMve5MmFg8T7J+pupHsrhq/2pRxu0gymDgs2WJU4b?= =?us-ascii?Q?w8HTA2DIa2HD2gwJ0+Hv0QT+YRuysUDXx998DrQEm4tCpJNfm33fK4vHTRla?= =?us-ascii?Q?U+xEXwjCNcYJhfwiG0/X4nwIWzWgqf3dJTjwoAVd556DH/B6ILHyEQKYhPAE?= =?us-ascii?Q?sHQMEGZ2CwnzqJQf1/MHYaH/8krL9Blm6zVUuuNU2yrhjGxw508+eJbQggRO?= =?us-ascii?Q?qrZfsamymhqq5/3BSS9pS34t7tOrBSLd4FzkM6GzNiB4fRtk33pQsTC9bIMD?= =?us-ascii?Q?H/cEoflzfmuXdhpKc17GPCRjETSo7/wZluI/BSyYQNszl0Bop+6Va2skbunO?= =?us-ascii?Q?jW7NSaGiURUjB0whUFbS563NB71qijJ+F2/MrCQhqRG0zFaSoE15SXXU/SWL?= =?us-ascii?Q?m4xurRGldAMDjHpk+Hh8JZFlxDFm2+rRpslq3oFtu7DbFPyDodpA1HMO/YgL?= =?us-ascii?Q?gyabAPSrdILOc8Ng1/Ch3KZQmbDg2X9tUMkh/Ay5A9DJdZ7HczQ4gR+J6aOI?= =?us-ascii?Q?Xzgjv7PfXNvTyJc06Tr4k7S2U5vBGIHo5teBuNKXQL52BUCTP8D2C++mceqD?= =?us-ascii?Q?OAmS6ic+0T/VkmIHsDu4pTlfp6Xeok9TOGqlLaOP/EW0S886HoZlMKgl77HJ?= =?us-ascii?Q?SMvHedLilxeTLWy+Mn2+CxHUK7Z3gDYyYudEN035IpsyDPYeVE8DJCBqwGnY?= =?us-ascii?Q?ALTnruoY1B0kZtmmAw7gFAi3PfAnXYdAczBGSMVGkeMgyHstIdJl6mRn6fCl?= =?us-ascii?Q?s8ERB8dW0oC0jC3SXHwe4aVACVihpSjfKOu+TAEMfQdM1HueYk5/dzh2yRb8?= =?us-ascii?Q?I45w87K1rR90fJNuGMAwkbiB/EoqhuW4P+LXJmePFk4uTczdsSU51ER6oF3m?= =?us-ascii?Q?sG/OXBqXTOj2QHXd6LUcxWrHqk2Yj9OyIK9MzTbTXmPCPx29I6cbWRjnFBg6?= =?us-ascii?Q?AohJPYGIPFJn5LjHb1EpocUgs2sAeMnzwyzhW7BMQVo4yqXGUzKYgfLdyNEj?= =?us-ascii?Q?FqDvrW2Qi5uzrYJmjojHo9+BD68Zn8O3cCAqorMQOzzOGKSuYBIhDv6kpRIZ?= =?us-ascii?Q?QkVpx19nTtcvErmvAGdO1yEO7fr4egM5hqhKXdm19m8P/GkmsuLHPJv/uUro?= =?us-ascii?Q?3sjAAJT8OkXNRoONY+duyPxjzI5M0na/gzzQaNK/Semb8bQEF0lnbgVL2f4?= =?us-ascii?Q?=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-8534-20-msonline-outlook-c7cf3.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: dbf324db-b8fa-4217-f303-08dd9cc0880c X-MS-Exchange-CrossTenant-originalarrivaltime: 27 May 2025 01:48:08.6051 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3P223MB1744 Subject: Re: [FFmpeg-devel] [PATCH 4/5] ffbuild/common.mak: clean up and move fftools/resources-specific code its Makefile 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 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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Ramiro Polla > Sent: Dienstag, 27. Mai 2025 03:33 > To: ffmpeg-devel@ffmpeg.org > Subject: [FFmpeg-devel] [PATCH 4/5] ffbuild/common.mak: clean up and move > fftools/resources-specific code its Makefile > > - Intermediate files are no longer removed; > - A .res suffix has been added to resource files, so that there's no > need to add new rules for each new filetype; > - Superfluous comments have been removed; > - Targets depending on CONFIG_RESOURCE_COMPRESSION have been > deduplicated. > --- > ffbuild/common.mak | 45 +------------------ > fftools/resources/.gitignore | 7 ++- > fftools/resources/Makefile | 31 ++++++++++--- > .../resources/{graph.css => graph.css.res} | 0 > .../resources/{graph.html => graph.html.res} | 0 > fftools/resources/resman.c | 12 ++--- > 6 files changed, 36 insertions(+), 59 deletions(-) > rename fftools/resources/{graph.css => graph.css.res} (100%) > rename fftools/resources/{graph.html => graph.html.res} (100%) > > diff --git a/ffbuild/common.mak b/ffbuild/common.mak > index ddf48923ea..27dd48a4e6 100644 > --- a/ffbuild/common.mak > +++ b/ffbuild/common.mak > @@ -139,46 +139,6 @@ else > $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst > .,_,$(basename $(notdir $@))) > endif > > -# 1) Preprocess CSS to a minified version > -%.css.min: TAG = SED > -%.css.min: %.css > - $(M)sed 's!/\\*.*\\*/!!g' $< \ > - | tr '\n' ' ' \ > - | tr -s ' ' \ > - | sed 's/^ //; s/ $$//' \ > - > $@ > - > -ifdef CONFIG_RESOURCE_COMPRESSION > - > -# 2) Gzip the minified CSS > -%.css.min.gz: TAG = GZIP > -%.css.min.gz: %.css.min > - $(M)gzip -nc9 $< > $@ > - > -# 3) Convert the gzipped CSS to a .c array > -%.css.c: %.css.min.gz $(BIN2CEXE) > - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > - > -# 4) Gzip the HTML file (no minification needed) > -%.html.gz: TAG = GZIP > -%.html.gz: %.html > - $(M)gzip -nc9 $< > $@ > - > -# 5) Convert the gzipped HTML to a .c array > -%.html.c: %.html.gz $(BIN2CEXE) > - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > - > -else # NO COMPRESSION > - > -# 2) Convert the minified CSS to a .c array > -%.css.c: %.css.min $(BIN2CEXE) > - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > - > -# 3) Convert the plain HTML to a .c array > -%.html.c: %.html $(BIN2CEXE) > - $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > -endif > - > clean:: > $(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%) > > @@ -229,10 +189,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=.c) $(PTXOBJS:.o=.gz) > $(PTXOBJS:.o=) > > alltools: $(TOOLS) > > @@ -252,7 +211,7 @@ $(TOOLOBJS): | tools > > OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) > $(STLIBOBJS) $(TESTOBJS)) > > -CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx > *.ptx.gz *.ptx.c *.ver *.version *.html.gz *.html.c *.css.gz *.css.c > *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb > +CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx > *.ptx.gz *.ptx.c *.ver *.version *.min.res *.res.gz *.res.c > *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb > LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a > > define RULES > diff --git a/fftools/resources/.gitignore b/fftools/resources/.gitignore > index 5f496535a6..4c56856284 100644 > --- a/fftools/resources/.gitignore > +++ b/fftools/resources/.gitignore > @@ -1,4 +1,3 @@ > -*.html.c > -*.css.c > -*.html.gz > -*.css.gz > +*.res.c > +*.res.gz > +*.res > diff --git a/fftools/resources/Makefile b/fftools/resources/Makefile > index 8579a52678..a8eb111441 100644 > --- a/fftools/resources/Makefile > +++ b/fftools/resources/Makefile > @@ -1,13 +1,32 @@ > clean:: > $(RM) $(CLEANSUFFIXES:%=fftools/resources/%) > > -vpath %.html $(SRC_PATH) > -vpath %.css $(SRC_PATH) > +vpath %.res $(SRC_PATH) > > -# Uncomment to prevent deletion during build > -#.PRECIOUS: %.css.c %.css.min %.css.gz %.css.min.gz %.html.gz %.html.c > +RESOURCEOBJS += fftools/resources/graph.css.min.res.o > +RESOURCEOBJS += fftools/resources/graph.html.res.o > > OBJS-resman += \ > fftools/resources/resman.o \ > - fftools/resources/graph.html.o \ > - fftools/resources/graph.css.o \ > + $(RESOURCEOBJS) > + > +%.css.min.res: TAG = SED > +%.css.min.res: %.css.res > + $(M)sed 's!/\\*.*\\*/!!g' $< \ > + | tr '\n' ' ' \ > + | tr -s ' ' \ > + | sed 's/^ //; s/ $$//' \ > + > $@ > + > +ifdef CONFIG_RESOURCE_COMPRESSION > +RES_GZ = .gz > +endif > + > +%.res.gz: TAG = GZIP > +%.res.gz: %.res > + $(M)gzip -nc9 $< > $@ > + > +%.res.c: %.res$(RES_GZ) $(BIN2CEXE) > + $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > + > +.SECONDARY: $(RESOURCEOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:.o=.gz) > diff --git a/fftools/resources/graph.css b/fftools/resources/graph.css.res > similarity index 100% > rename from fftools/resources/graph.css > rename to fftools/resources/graph.css.res > diff --git a/fftools/resources/graph.html b/fftools/resources/graph.html.res > similarity index 100% > rename from fftools/resources/graph.html > rename to fftools/resources/graph.html.res > diff --git a/fftools/resources/resman.c b/fftools/resources/resman.c > index a9e21626fa..00518efd87 100644 > --- a/fftools/resources/resman.c > +++ b/fftools/resources/resman.c > @@ -38,15 +38,15 @@ > #include "libavutil/dict.h" > #include "libavutil/common.h" > > -extern const unsigned char ff_graph_html_data[]; > -extern const unsigned int ff_graph_html_len; > +extern const unsigned char ff_graph_html_res_data[]; > +extern const unsigned int ff_graph_html_res_len; > > -extern const unsigned char ff_graph_css_data[]; > -extern const unsigned ff_graph_css_len; > +extern const unsigned char ff_graph_css_min_res_data[]; > +extern const unsigned ff_graph_css_min_res_len; > > static const FFResourceDefinition resource_definitions[] = { > - [FF_RESOURCE_GRAPH_CSS] = { FF_RESOURCE_GRAPH_CSS, "graph.css", > &ff_graph_css_data[0], &ff_graph_css_len }, > - [FF_RESOURCE_GRAPH_HTML] = { FF_RESOURCE_GRAPH_HTML, "graph.html", > &ff_graph_html_data[0], &ff_graph_html_len }, > + [FF_RESOURCE_GRAPH_CSS] = { FF_RESOURCE_GRAPH_CSS, "graph.css", > &ff_graph_css_min_res_data[0], &ff_graph_css_min_res_len }, > + [FF_RESOURCE_GRAPH_HTML] = { FF_RESOURCE_GRAPH_HTML, "graph.html", > &ff_graph_html_res_data[0], &ff_graph_html_res_len }, > }; > > > -- I actually wanted to push this tomorrow: https://patchwork.ffmpeg.org/project/ffmpeg/patch/pull.80.v4.ffstaging.FFmpeg.1748037922309.ffmpegagent@gmail.com/ As discussed with Timo, the V4 keeps .ptx files unconditionally while all other intermediates are handled as intermediates per Gnu make default behavior (i.e. get deleted) Thanks sw _______________________________________________ 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".