* qatar/master:
build: fix 'clean' target
ZeroCodec: Flip output
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
... | ... |
@@ -128,7 +128,13 @@ CLEANSUFFIXES = *.d *.o *~ *.h.c *.map *.ver *.ho *.gcno *.gcda |
128 | 128 |
DISTCLEANSUFFIXES = *.pc |
129 | 129 |
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a |
130 | 130 |
|
131 |
+define RULES |
|
131 | 132 |
clean:: |
132 | 133 |
$(RM) $(OBJS) $(OBJS:.o=.d) |
134 |
+ $(RM) $(HOSTPROGS) |
|
135 |
+ $(RM) $(TOOLS) |
|
136 |
+endef |
|
137 |
+ |
|
138 |
+$(eval $(RULES)) |
|
133 | 139 |
|
134 | 140 |
-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d)) |
... | ... |
@@ -30,7 +30,7 @@ |
30 | 30 |
|
31 | 31 |
#define LIBAVCODEC_VERSION_MAJOR 54 |
32 | 32 |
#define LIBAVCODEC_VERSION_MINOR 79 |
33 |
-#define LIBAVCODEC_VERSION_MICRO 101 |
|
33 |
+#define LIBAVCODEC_VERSION_MICRO 102 |
|
34 | 34 |
|
35 | 35 |
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
36 | 36 |
LIBAVCODEC_VERSION_MINOR, \ |
... | ... |
@@ -62,7 +62,7 @@ endif |
62 | 62 |
|
63 | 63 |
clean:: |
64 | 64 |
$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ |
65 |
- $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(HOSTOBJS) $(HOSTPROGS) |
|
65 |
+ $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) |
|
66 | 66 |
|
67 | 67 |
distclean:: clean |
68 | 68 |
$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) |