Commit 07b3790d authored by Mans Rullgard's avatar Mans Rullgard

build: simplify linking tools with cmdutils.o

This avoids repeating cmdutils.o in both the prerequisites and
the link command.
Signed-off-by: 's avatarMans Rullgard <>
parent bf868c4a
......@@ -124,8 +124,8 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
define DOPROG
OBJS-$(1) += $(1).o
$(1)$(EXESUF): $(OBJS-$(1))
OBJS-$(1) += $(1).o cmdutils.o
$(1)$(EXESUF): $$(OBJS-$(1))
$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
$(1)$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1))
......@@ -134,8 +134,8 @@ endef
$(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P))))
$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
$(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) cmdutils.o $(FF_EXTRALIBS)
$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
OBJDIRS += tools
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment