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 E15244F121 for ; Fri, 16 May 2025 22:36:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 436F768D3D7; Sat, 17 May 2025 01:36:43 +0300 (EEST) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A145B68CF02 for ; Sat, 17 May 2025 01:36:36 +0300 (EEST) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5fbcd9088a7so3645428a12.0 for ; Fri, 16 May 2025 15:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747434995; x=1748039795; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=pdFODU3aq37Y9kBvjoOMskBhlB6t/D1u2LWA4msQvTI=; b=bCjT3j1avUhHzApSeHAiogxQOwEdpuvBTQh+ZEoDwceyNX26HZQ5HM+P+vC+LRBicz aOs2ruxnnw4yIv33DrVH05Ni9zoxBH7blZPAS9H7XTqdg/YcNJweb5A1ZT5xGEN33fOa 5OI+eBXTGeAyUs1TAjXS2UE1IWmgirkCNJRYqi63FHZIVBIYzBVWwBNPdYM8yRxWwCX/ KZHKtOE6gMANSai5TZeO4/CMfCTsd7vYdHw7ObcxEvp54ZvKH3bD+kaT77K5Ttsch6wk ttZXR91rat6DUf/SYk8Jncz41i+A3lE14FL3lcm/HzrZxqdrks7pW+3Tb0GPC6uuj+CY orBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747434995; x=1748039795; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pdFODU3aq37Y9kBvjoOMskBhlB6t/D1u2LWA4msQvTI=; b=w/w0UWzRjJJNe8vxvIKRt+GxRZnucREZTtU2ZeUWWHvJM/Qy9DbcRysX9HECkzP44W YRmQrQyGKCyc0luGXu+pNGQXwiGvsO6WgkqUAV55iCbekSdg0agk0Fyc13LLipOioWtp +lBXSGbSwNdz2sa9po4W1Yk98EGNLRNji5lYxqyyI19kVZrarO5+88WCo70oo/7lZLHf wZR/3KXTwNKpRo2k61tSQ4tYCgTv4v5rgjLBrVNHObYkTqAZLbXl0vXKIIC19NraCdXq cZ4/eJlgbCtc1CDm8moVQH7hFqESCgktFek6WMUz7BTGG47/YoIwP8k6o8PFdtQtFfq8 Ld2Q== X-Gm-Message-State: AOJu0Yz3gVGbXSJOuA6KusOmQDBCHQhc/gWUjjAruPH4W6oM45xNFrOF joOc25H2zwU5gJTg0ISL7OMaDWJOUhbhCTlIhSRqBxKIrLJ6QNUTznmQ7umwuNGF X-Gm-Gg: ASbGncvKtSlfEXuOR7FXQBCkY+FW0QhZlbwkf87IIIFa7Q1fjnpvP0Yt6bl9/3qcGpJ Bq8yZQ1gytZAQndJd77CorR0acfJ+91Yex4wD15s+9ZRwqRJN7LGvdat7rPIwRKZ1ltaCGyCTbm 4c4CGTrEk4ZUU1biidVgb167OZ30knAJftj+QZisYRKmyCORoqNUD/PYguHvXsrm/1sGp0yemiA iMlGUdkCqB9qd3mDcwa6LoZrJsLdxox4iha6luX+XZrfY3XPL99sStA0avrLaP+FzLK55iB0Cq+ zE24+a5lck9CDrpHpRuPth2WmyHu3YThfKud+tNipgc/sFLCW0CnxMtqzai3eqMsod8+cyyMFO6 p7hcmY2cVI/rc8nEG2Bn9UWk7Q41Ua9K8 X-Google-Smtp-Source: AGHT+IHroNZ/HXYIb583XD7ODR6r8+erKbJ/2STce1bQptCef0csOh9m2C0dEu6m4aSutA0VY+blXA== X-Received: by 2002:a05:6402:5216:b0:600:129:444e with SMTP id 4fb4d7f45d1cf-6008a3912f7mr4570437a12.4.1747434995300; Fri, 16 May 2025 15:36:35 -0700 (PDT) Received: from localhost.localdomain (20.238-74-193.fia-dyn.isp.proximus.be. [193.74.238.20]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6004d50364dsm1992346a12.32.2025.05.16.15.36.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 May 2025 15:36:34 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 May 2025 00:36:33 +0200 Message-Id: <20250516223633.25196-1-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] build: remove unused SLIBOBJS variable 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: The SLIBOBJS variable was introduced in 56572787ae2 but is no longer used. Another variable, SHLIBOBJS, was introduced after SLIBOBJS, in 20b0d24c2f7. The functionality from SLIBOBJS was effectively migrated to SHLIBOBJS in b77fff47d0d. No code has used SLIBOBJS since. This commit removes all remaining references to SLIBOBJS from the build system. --- Makefile | 3 +-- ffbuild/common.mak | 7 ++----- ffbuild/library.mak | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index e2250f6bc6..09509bb930 100644 --- a/Makefile +++ b/Makefile @@ -104,8 +104,7 @@ SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \ ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \ MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \ MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS RVVB-OBJS \ - OBJS SLIBOBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS \ - SIMD128-OBJS + OBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS SIMD128-OBJS define RESET $(1) := diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 0e1eb1f62b..1ac3c31c1e 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -197,7 +197,6 @@ endif include $(SRC_PATH)/ffbuild/arch.mak OBJS += $(OBJS-yes) -SLIBOBJS += $(SLIBOBJS-yes) SHLIBOBJS += $(SHLIBOBJS-yes) STLIBOBJS += $(STLIBOBJS-yes) FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS) @@ -207,7 +206,6 @@ LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS) OBJS := $(sort $(OBJS:%=$(SUBDIR)%)) -SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%)) SHLIBOBJS := $(sort $(SHLIBOBJS:%=$(SUBDIR)%)) STLIBOBJS := $(sort $(STLIBOBJS:%=$(SUBDIR)%)) TESTOBJS := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o) @@ -245,13 +243,12 @@ $(HOSTPROGS): %$(HOSTEXESUF): %.o $(OBJS): | $(sort $(dir $(OBJS))) $(HOBJS): | $(sort $(dir $(HOBJS))) $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS))) -$(SLIBOBJS): | $(sort $(dir $(SLIBOBJS))) $(SHLIBOBJS): | $(sort $(dir $(SHLIBOBJS))) $(STLIBOBJS): | $(sort $(dir $(STLIBOBJS))) $(TESTOBJS): | $(sort $(dir $(TESTOBJS))) $(TOOLOBJS): | tools -OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS)) +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 LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a @@ -263,4 +260,4 @@ endef $(eval $(RULES)) --include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SHLIBOBJS:.o=.d) $(STLIBOBJS:.o=.d) $(SLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_X86ASMD).d) +-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SHLIBOBJS:.o=.d) $(STLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_X86ASMD).d) diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 288c82a177..569708c73b 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -70,7 +70,7 @@ $(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) -$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SUBDIR)lib$(NAME).ver $(SLIB_CREATE_DEF_CMD) ifeq ($(RESPONSE_FILES),yes) $(Q)echo $$(filter %.o,$$^) > $$@.objs -- 2.39.5 _______________________________________________ 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".