diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-11 08:24:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-11 08:24:45 +0100 |
| commit | 9696ad6a76534b16dfaf9872dd20017f9f8d18e4 (patch) | |
| tree | 2d766f16cc4c8db5cfc895f1ef807ed1866084b0 /common.mak | |
| parent | fd3cdcaf5f4d4f21e61491f19742092f855e93ac (diff) | |
| parent | 395c3feb3bb165af5760d287a9a64344b6269fe2 (diff) | |
| download | ffmpeg-9696ad6a76534b16dfaf9872dd20017f9f8d18e4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix 'clean' target
ZeroCodec: Flip output
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common.mak b/common.mak index 0c48484e0e..8775b02158 100644 --- a/common.mak +++ b/common.mak @@ -128,7 +128,13 @@ CLEANSUFFIXES = *.d *.o *~ *.h.c *.map *.ver *.ho *.gcno *.gcda DISTCLEANSUFFIXES = *.pc LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a +define RULES clean:: $(RM) $(OBJS) $(OBJS:.o=.d) + $(RM) $(HOSTPROGS) + $(RM) $(TOOLS) +endef + +$(eval $(RULES)) -include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d)) |