summaryrefslogtreecommitdiff
path: root/common.mak
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-10-25 14:00:28 +0000
committerMåns Rullgård <mans@mansr.com>2008-10-25 14:00:28 +0000
commitc87348a9223eb0e619fcf6b476fe79ea3ceeb495 (patch)
tree81fd8ee7e64704d9d1caea4d540ed0ad0d59fc70 /common.mak
parent0ca1656a2bd0e7a21935968a466fbfed511bdc29 (diff)
downloadffmpeg-c87348a9223eb0e619fcf6b476fe79ea3ceeb495.tar.gz
Use OBJS variable for all object files
There is no longer any need to differentiate the object files by source type. Originally committed as revision 15708 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak4
1 files changed, 0 insertions, 4 deletions
diff --git a/common.mak b/common.mak
index 59604b2640..d4c1f14862 100644
--- a/common.mak
+++ b/common.mak
@@ -60,16 +60,12 @@ endif
CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes)
-ASM_OBJS += $(ASM_OBJS-yes)
-CPP_OBJS += $(CPP_OBJS-yes)
FFLIBS := $(FFLIBS-yes) $(FFLIBS)
TESTS += $(TESTS-yes)
FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
-OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS)
-
OBJS := $(addprefix $(SUBDIR),$(OBJS))
TESTS := $(addprefix $(SUBDIR),$(TESTS))