build: Remove pkg-config files on clean instead of on distclean
authorDiego Biurrun <diego@biurrun.de>
Mon, 6 Nov 2017 16:49:55 +0000 (17:49 +0100)
committerDiego Biurrun <diego@biurrun.de>
Thu, 9 Nov 2017 14:21:33 +0000 (15:21 +0100)
The files are no longer generated by configure, so they should not
be removed by the distclean target any longer.

Makefile
avbuild/common.mak
avbuild/library.mak

index 1c10f15..5f91294 100644 (file)
--- 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
index a627dc0..1798953 100644 (file)
@@ -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
index a4b57e8..98a100d 100644 (file)
@@ -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)"