Merge commit '7ebe7e8e7a76c0ce302f4f583ef0d14220031214'
* commit '7ebe7e8e7a76c0ce302f4f583ef0d14220031214': build: Remove pkg-config files on clean instead of on distclean Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
e0087a5624
1
Makefile
1
Makefile
|
@ -139,7 +139,6 @@ clean::
|
||||||
$(RM) -rf coverage.info coverage.info.in lcov
|
$(RM) -rf coverage.info coverage.info.in lcov
|
||||||
|
|
||||||
distclean::
|
distclean::
|
||||||
$(RM) $(DISTCLEANSUFFIXES)
|
|
||||||
$(RM) .version avversion.h config.asm config.h mapfile \
|
$(RM) .version avversion.h config.asm config.h mapfile \
|
||||||
ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
|
ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
|
||||||
version.h libavutil/ffversion.h libavcodec/codec_names.h \
|
version.h libavutil/ffversion.h libavcodec/codec_names.h \
|
||||||
|
|
|
@ -163,8 +163,7 @@ $(TOOLOBJS): | tools
|
||||||
|
|
||||||
OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS))
|
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
|
CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.pc *.ptx *.ptx.c *.ver *.version *$(DEFAULT_X86ASMD).asm *~
|
||||||
DISTCLEANSUFFIXES = *.pc
|
|
||||||
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
|
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
|
||||||
|
|
||||||
define RULES
|
define RULES
|
||||||
|
|
|
@ -61,10 +61,6 @@ clean::
|
||||||
$(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
$(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
||||||
$(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%)
|
$(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%)
|
||||||
|
|
||||||
distclean:: clean
|
|
||||||
$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) \
|
|
||||||
$(DISTCLEANSUFFIXES:%=$(SUBDIR)tests/%)
|
|
||||||
|
|
||||||
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
|
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
|
||||||
$(Q)mkdir -p "$(SHLIBDIR)"
|
$(Q)mkdir -p "$(SHLIBDIR)"
|
||||||
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
|
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user