diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 02:55:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 02:58:15 +0200 |
| commit | 7ac167493e5404fd2d3f307d02127f23fca970f0 (patch) | |
| tree | bea8a71cd59b1ea9a63692f7df1bdedb8446a9c1 /common.mak | |
| parent | 859676dd426e7051b41b174886e6e64271e93cdc (diff) | |
| parent | e006d71fa849542eb27146efac629288703b3d75 (diff) | |
| download | ffmpeg-7ac167493e5404fd2d3f307d02127f23fca970f0.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
mpegts: propagate avio EOF in read_packet()
configure: Initial support for --target-os=symbian
Fixed-point FFT and MDCT
Include dependencies for test programs
ac3enc: simplify sym_quant()
flvdec: read index stored in the 'keyframes' tag.
mov: Add support for zero-sized stsc runs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common.mak b/common.mak index 3d1a1293fb..2b7baa2e15 100644 --- a/common.mak +++ b/common.mak @@ -89,7 +89,7 @@ FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(ALLFFLIBS)) $(LDFLAGS) EXAMPLES := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES))) OBJS := $(addprefix $(SUBDIR),$(sort $(OBJS))) -TESTOBJS := $(addprefix $(SUBDIR),$(TESTOBJS)) +TESTOBJS := $(addprefix $(SUBDIR),$(TESTOBJS) $(TESTPROGS:%=%-test.o)) TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS))) HOSTOBJS := $(addprefix $(SUBDIR),$(addsuffix .o,$(HOSTPROGS))) HOSTPROGS := $(addprefix $(SUBDIR),$(addsuffix $(HOSTEXESUF),$(HOSTPROGS))) @@ -111,4 +111,4 @@ CLEANSUFFIXES = *.d *.o *~ *.ho *.map *.ver DISTCLEANSUFFIXES = *.pc LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp --include $(wildcard $(OBJS:.o=.d)) +-include $(wildcard $(OBJS:.o=.d) $(TESTOBJS:.o=.d)) |