Browse code

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>

Mans Rullgard authored on 2012/10/15 11:59:16
Showing 1 changed files
... ...
@@ -124,8 +124,8 @@ endef
124 124
 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
125 125
 
126 126
 define DOPROG
127
-OBJS-$(1) += $(1).o
128
-$(1)$(EXESUF): $(OBJS-$(1))
127
+OBJS-$(1) += $(1).o cmdutils.o
128
+$(1)$(EXESUF): $$(OBJS-$(1))
129 129
 $$(OBJS-$(1)): CFLAGS  += $(CFLAGS-$(1))
130 130
 $(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
131 131
 $(1)$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1))
... ...
@@ -134,8 +134,8 @@ endef
134 134
 
135 135
 $(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P))))
136 136
 
137
-$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
138
-	$(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) cmdutils.o $(FF_EXTRALIBS)
137
+$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
138
+	$(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
139 139
 
140 140
 OBJDIRS += tools
141 141