Skip to content

Commit

Permalink
build: Remove pkg-config files on clean instead of on distclean
Browse files Browse the repository at this point in the history
The files are no longer generated by configure, so they should not
be removed by the distclean target any longer.
  • Loading branch information
DonDiego committed Nov 9, 2017
1 parent fbf77b5 commit 7ebe7e8
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions avbuild/common.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions avbuild/library.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down

0 comments on commit 7ebe7e8

Please sign in to comment.