diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-10-15 03:59:16 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-10-15 22:28:07 +0100 |
| commit | 07b3790d36266358e3bda19cec3b843e5129a986 (patch) | |
| tree | 778e93770b85f8de6f0349222cb311743f60ca71 | |
| parent | bf868c4a9bc6c1ac4c4753822a7c652b7f7c8ff7 (diff) | |
| download | ffmpeg-07b3790d36266358e3bda19cec3b843e5129a986.tar.gz | |
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 <mans@mansr.com>
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |