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 | |
| 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>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | common.mak | 6 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 | ||||
| -rw-r--r-- | library.mak | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -153,7 +153,6 @@ uninstall-data: clean:: $(RM) $(ALLPROGS) $(ALLPROGS_G) $(RM) $(CLEANSUFFIXES) - $(RM) $(TOOLS) $(RM) $(CLEANSUFFIXES:%=tools/%) $(RM) coverage.info $(RM) -r coverage-html 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)) diff --git a/libavcodec/version.h b/libavcodec/version.h index 1aab993df8..bea75d96b3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MINOR 79 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/library.mak b/library.mak index 470795c23b..b0d4151dbd 100644 --- a/library.mak +++ b/library.mak @@ -62,7 +62,7 @@ endif clean:: $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ - $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(HOSTOBJS) $(HOSTPROGS) + $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) distclean:: clean $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) |