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

Makefile +1 −2
ffbuild/common.mak +2 −5
ffbuild/library.mak +1 −1

Makefile+1−2

@@ -103,8 +103,7 @@ SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \ · 102 unmodified lines
103	103	ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \
104	104	MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
105	105	MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS RVVB-OBJS \
106		− OBJS SLIBOBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS \
107		− SIMD128-OBJS
	106	+ OBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS SIMD128-OBJS
108	107
109	108	define RESET
110	109	$(1) :=

ffbuild/common.mak+2−5

@@ -197,7 +197,6 @@ endif · 196 unmodified lines
197	197	include $(SRC_PATH)/ffbuild/arch.mak
198	198
199	199	OBJS += $(OBJS-yes)
200		−SLIBOBJS += $(SLIBOBJS-yes)
201	200	SHLIBOBJS += $(SHLIBOBJS-yes)
202	201	STLIBOBJS += $(STLIBOBJS-yes)
203	202	FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
@@ -207,7 +206,6 @@ LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) · 3 unmodified lines
207	206	FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)
208	207
209	208	OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
210		−SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%))
211	209	SHLIBOBJS := $(sort $(SHLIBOBJS:%=$(SUBDIR)%))
212	210	STLIBOBJS := $(sort $(STLIBOBJS:%=$(SUBDIR)%))
213	211	TESTOBJS := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)
@@ -245,13 +243,12 @@ $(HOSTPROGS): %$(HOSTEXESUF): %.o · 31 unmodified lines
245	243	$(OBJS): \| $(sort $(dir $(OBJS)))
246	244	$(HOBJS): \| $(sort $(dir $(HOBJS)))
247	245	$(HOSTOBJS): \| $(sort $(dir $(HOSTOBJS)))
248		−$(SLIBOBJS): \| $(sort $(dir $(SLIBOBJS)))
249	246	$(SHLIBOBJS): \| $(sort $(dir $(SHLIBOBJS)))
250	247	$(STLIBOBJS): \| $(sort $(dir $(STLIBOBJS)))
251	248	$(TESTOBJS): \| $(sort $(dir $(TESTOBJS)))
252	249	$(TOOLOBJS): \| tools
253	250
254		−OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS))
	251	+OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS))
255	252
256	253	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
257	254	LIBSUFFIXES = .a .lib .so .so.* .dylib .dll .def .dll.a
@@ -263,4 +260,4 @@ endef · 5 unmodified lines
263	260
264	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	70	$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
71	71	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
72	72
73		−$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
	73	+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SHLIBOBJS) $(SUBDIR)lib$(NAME).ver
74	74	$(SLIB_CREATE_DEF_CMD)
75	75	ifeq ($(RESPONSE_FILES),yes)
76	76	$(Q)echo $$(filter %.o,$$^) > $$@.objs

build: remove unused SLIBOBJS variable

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code