[FFmpeg-cvslog] build: Remove pkg-config files on clean instead of on distclean

Diego Biurrun git at videolan.org
Sun Nov 12 06:04:12 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Nov  6 17:49:55 2017 +0100| [7ebe7e8e7a76c0ce302f4f583ef0d14220031214] | committer: Diego Biurrun

build: Remove pkg-config files on clean instead of on distclean

The files are no longer generated by configure, so they should not
be removed by the distclean target any longer.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ebe7e8e7a76c0ce302f4f583ef0d14220031214
---

 Makefile            | 1 -
 avbuild/common.mak  | 3 +--
 avbuild/library.mak | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 1c10f15462..5f91294c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,6 @@ clean::
 	$(RM) -rf coverage.info lcov
 
 distclean::
-	$(RM) $(DISTCLEANSUFFIXES)
 	$(RM) .version avversion.h config.asm config.h mapfile \
             avbuild/.config avbuild/config.* libavutil/avconfig.h \
             libavcodec/bsf_list.c libavformat/protocol_list.c
diff --git a/avbuild/common.mak b/avbuild/common.mak
index a627dc0ccf..17989533f9 100644
--- a/avbuild/common.mak
+++ b/avbuild/common.mak
@@ -49,8 +49,7 @@ $(TOOLOBJS): | tools
 
 OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS))
 
-CLEANSUFFIXES     = *.d *.o *~ *.h.c *.gcda *.gcno *.map *.ver *.version
-DISTCLEANSUFFIXES = *.pc
+CLEANSUFFIXES     = *.d *.gcda *.gcno *.h.c *.map *.o *.pc *.ver *.version *~
 LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
 
 define RULES
diff --git a/avbuild/library.mak b/avbuild/library.mak
index a4b57e8824..98a100dc7e 100644
--- a/avbuild/library.mak
+++ b/avbuild/library.mak
@@ -57,10 +57,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)"



More information about the ffmpeg-cvslog mailing list