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
This commit is contained in:
@@ -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))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user