diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-12 00:59:58 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-12 00:59:58 -0300 |
| commit | e0087a5624117a1d643e2cb433ecc4d536756dda (patch) | |
| tree | 756081834f51883e7d1c5f7b00f6494c04f0eee4 | |
| parent | 64581372005d57e47ef6580ee2a0e81144f3e5d2 (diff) | |
| parent | 7ebe7e8e7a76c0ce302f4f583ef0d14220031214 (diff) | |
| download | ffmpeg-e0087a5624117a1d643e2cb433ecc4d536756dda.tar.gz | |
Merge commit '7ebe7e8e7a76c0ce302f4f583ef0d14220031214'
* commit '7ebe7e8e7a76c0ce302f4f583ef0d14220031214':
build: Remove pkg-config files on clean instead of on distclean
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | ffbuild/common.mak | 3 | ||||
| -rw-r--r-- | ffbuild/library.mak | 4 |
3 files changed, 1 insertions, 7 deletions
@@ -139,7 +139,6 @@ clean:: $(RM) -rf coverage.info coverage.info.in lcov distclean:: - $(RM) $(DISTCLEANSUFFIXES) $(RM) .version avversion.h config.asm config.h mapfile \ ffbuild/.config ffbuild/config.* libavutil/avconfig.h \ version.h libavutil/ffversion.h libavcodec/codec_names.h \ diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 63a3c2f2d0..eb41b05ee6 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -163,8 +163,7 @@ $(TOOLOBJS): | tools OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS)) -CLEANSUFFIXES = *.d *.o *~ *.h.c *.gcda *.gcno *.map *.ver *.version *.ho *$(DEFAULT_X86ASMD).asm *.ptx *.ptx.c -DISTCLEANSUFFIXES = *.pc +CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.pc *.ptx *.ptx.c *.ver *.version *$(DEFAULT_X86ASMD).asm *~ LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a define RULES diff --git a/ffbuild/library.mak b/ffbuild/library.mak index a590a94918..069079f5e7 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -61,10 +61,6 @@ clean:: $(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%) -distclean:: clean - $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) \ - $(DISTCLEANSUFFIXES:%=$(SUBDIR)tests/%) - install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) $(Q)mkdir -p "$(SHLIBDIR)" $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)" |