History

build: remove unused SLIBOBJS variable

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.

Ramiro Polla committed 1 year ago

Commit db5e0e21 parent 9b9a2873 files · +4 −8Browse files

Unified · Split

3 files
  1. Makefile +1 −2
  2. ffbuild/common.mak +2 −5
  3. ffbuild/library.mak +1 −1
Makefile+1−2
@@ -103,8 +103,7 @@ SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \ · 102 unmodified lines
103 ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \103 ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \
104 MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \104 MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
105 MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS RVVB-OBJS \105 MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS RVVB-OBJS \
106 OBJS SLIBOBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS \106 OBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS SIMD128-OBJS
107 SIMD128-OBJS
108 107
109define RESET108define RESET
110$(1) :=109$(1) :=
ffbuild/common.mak+2−5
@@ -197,7 +197,6 @@ endif · 196 unmodified lines
197include $(SRC_PATH)/ffbuild/arch.mak197include $(SRC_PATH)/ffbuild/arch.mak
198 198
199OBJS += $(OBJS-yes)199OBJS += $(OBJS-yes)
200SLIBOBJS += $(SLIBOBJS-yes)
201SHLIBOBJS += $(SHLIBOBJS-yes)200SHLIBOBJS += $(SHLIBOBJS-yes)
202STLIBOBJS += $(STLIBOBJS-yes)201STLIBOBJS += $(STLIBOBJS-yes)
203FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)202FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
@@ -207,7 +206,6 @@ LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) · 3 unmodified lines
207FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)206FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)
208 207
209OBJS := $(sort $(OBJS:%=$(SUBDIR)%))208OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
210SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%))
211SHLIBOBJS := $(sort $(SHLIBOBJS:%=$(SUBDIR)%))209SHLIBOBJS := $(sort $(SHLIBOBJS:%=$(SUBDIR)%))
212STLIBOBJS := $(sort $(STLIBOBJS:%=$(SUBDIR)%))210STLIBOBJS := $(sort $(STLIBOBJS:%=$(SUBDIR)%))
213TESTOBJS := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)211TESTOBJS := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)
@@ -245,13 +243,12 @@ $(HOSTPROGS): %$(HOSTEXESUF): %.o · 31 unmodified lines
245$(OBJS): | $(sort $(dir $(OBJS)))243$(OBJS): | $(sort $(dir $(OBJS)))
246$(HOBJS): | $(sort $(dir $(HOBJS)))244$(HOBJS): | $(sort $(dir $(HOBJS)))
247$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))245$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
248$(SLIBOBJS): | $(sort $(dir $(SLIBOBJS)))
249$(SHLIBOBJS): | $(sort $(dir $(SHLIBOBJS)))246$(SHLIBOBJS): | $(sort $(dir $(SHLIBOBJS)))
250$(STLIBOBJS): | $(sort $(dir $(STLIBOBJS)))247$(STLIBOBJS): | $(sort $(dir $(STLIBOBJS)))
251$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))248$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))
252$(TOOLOBJS): | tools249$(TOOLOBJS): | tools
253 250
254OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS))251OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS))
255 252
256CLEANSUFFIXES = *.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 *.pdb253CLEANSUFFIXES = *.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
257LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a254LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
@@ -263,4 +260,4 @@ endef · 5 unmodified lines
263 260
264$(eval $(RULES))261$(eval $(RULES))
265 262
266-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)263-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)
ffbuild/library.mak+1−1
@@ -70,7 +70,7 @@ $(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS) · 69 unmodified lines
70$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)70$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
71 $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)71 $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
72 72
73$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver73$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SUBDIR)lib$(NAME).ver
74 $(SLIB_CREATE_DEF_CMD)74 $(SLIB_CREATE_DEF_CMD)
75ifeq ($(RESPONSE_FILES),yes)75ifeq ($(RESPONSE_FILES),yes)
76 $(Q)echo $$(filter %.o,$$^) > $$@.objs76 $(Q)echo $$(filter %.o,$$^) > $$@.objs

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t