Module: libav Branch: master Commit: 07b3790d36266358e3bda19cec3b843e5129a986
Author: Mans Rullgard <[email protected]> Committer: Mans Rullgard <[email protected]> Date: Mon Oct 15 03:59:16 2012 +0100 build: simplify linking tools with cmdutils.o This avoids repeating cmdutils.o in both the prerequisites and the link command. Signed-off-by: Mans Rullgard <[email protected]> --- Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1cbf2aa..3202f5d 100644 --- a/Makefile +++ b/Makefile @@ -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) + $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) OBJDIRS += tools _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
