aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-09 14:58:08 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-09 14:58:08 +0000
commit7acc01042e5eeeaa5ba1a44e6215b43ceafa78e9 (patch)
tree2dbd5f15344c9e899b47a877e3a238a0fe69596f
parentfb6a32c30f408d7c5fcbb484b08328f439c0da42 (diff)
downloadffmpeg-7acc01042e5eeeaa5ba1a44e6215b43ceafa78e9.tar.gz
Remove duplicates from OBJS
Originally committed as revision 22391 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mak b/common.mak
index 1df1b78542..4094ef198b 100644
--- a/common.mak
+++ b/common.mak
@@ -83,7 +83,7 @@ FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(ALLFFLIBS)) $(LDFLAGS)
EXAMPLES := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES)))
-OBJS := $(addprefix $(SUBDIR),$(OBJS))
+OBJS := $(addprefix $(SUBDIR),$(sort $(OBJS)))
TESTOBJS := $(addprefix $(SUBDIR),$(TESTOBJS))
TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
HOSTOBJS := $(addprefix $(SUBDIR),$(addsuffix .o,$(HOSTPROGS)))