diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-10-25 14:00:28 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-10-25 14:00:28 +0000 |
| commit | c87348a9223eb0e619fcf6b476fe79ea3ceeb495 (patch) | |
| tree | 81fd8ee7e64704d9d1caea4d540ed0ad0d59fc70 /common.mak | |
| parent | 0ca1656a2bd0e7a21935968a466fbfed511bdc29 (diff) | |
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.mak | 4 |
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)) |