This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 33d5616fbe ffbuild: show install destinations in the INSTALL build
output
33d5616fbe is described below
commit 33d5616fbeb9c0581c6a25a624aae8195335815b
Author: Kacper Michajłow <[email protected]>
AuthorDate: Sun Jun 28 01:03:54 2026 +0200
Commit: Kacper Michajłow <[email protected]>
CommitDate: Mon Aug 10 17:45:18 2026 +0000
ffbuild: show install destinations in the INSTALL build output
The INSTALL pretty-printer echoed the rule prerequisites ($^), which
printed duplicate and phony names and never showed the destination.
Convert the install recipes to an INSTALL_FILES helper that receives the
install options, source files and destination as separate arguments. In
quiet mode it prints one "source -> destination" line per installed
file.
Signed-off-by: Kacper Michajłow <[email protected]>
---
Makefile | 2 +-
doc/Makefile | 6 +++---
doc/examples/Makefile | 4 ++--
ffbuild/common.mak | 5 ++++-
ffbuild/library.mak | 12 ++++++------
fftools/Makefile | 2 +-
6 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 649bf5132b..1fe6549ba8 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ install-libs: install-libs-yes
install-data: $(DATA_FILES)
$(Q)mkdir -p "$(DATADIR)"
- $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
+ $(call INSTALL_FILES,-m 644,$(DATA_FILES),$(DATADIR))
uninstall: uninstall-data uninstall-headers uninstall-libs uninstall-pkgconfig
diff --git a/doc/Makefile b/doc/Makefile
index 7b683afa17..64d15d1c5e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -120,7 +120,7 @@ install-progs-$(CONFIG_DOC): install-html
install-html: $(HTMLPAGES)
$(Q)mkdir -p "$(DOCDIR)"
- $(INSTALL) -m 644 $(HTMLPAGES) "$(DOCDIR)"
+ $(call INSTALL_FILES,-m 644,$(HTMLPAGES),$(DOCDIR))
endif
ifdef CONFIG_MANPAGES
@@ -128,9 +128,9 @@ install-progs-$(CONFIG_DOC): install-man
install-man: $(MANPAGES)
$(Q)mkdir -p "$(MANDIR)/man1"
- $(INSTALL) -m 644 $(MANPAGES1) "$(MANDIR)/man1"
+ $(call INSTALL_FILES,-m 644,$(MANPAGES1),$(MANDIR)/man1)
$(Q)mkdir -p "$(MANDIR)/man3"
- $(INSTALL) -m 644 $(MANPAGES3) "$(MANDIR)/man3"
+ $(call INSTALL_FILES,-m 644,$(MANPAGES3),$(MANDIR)/man3)
endif
uninstall: uninstall-doc
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index 4efed6b11d..0d8feb6cb2 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -46,8 +46,8 @@ install: install-examples
install-examples: $(EXAMPLES_FILES)
$(Q)mkdir -p "$(DATADIR)/examples"
- $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
- $(INSTALL) -m 644 $(EXAMPLE_MAKEFILE:%=%.example)
"$(DATADIR)/examples/Makefile"
+ $(call INSTALL_FILES,-m 644,$(EXAMPLES_FILES),$(DATADIR)/examples)
+ $(call INSTALL_FILES,-m
644,$(EXAMPLE_MAKEFILE:%=%.example),$(DATADIR)/examples/Makefile)
uninstall: uninstall-examples
diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index 4ac54197b7..49cb6623a9 100644
--- a/ffbuild/common.mak
+++ b/ffbuild/common.mak
@@ -16,6 +16,9 @@ endif
BIN2CEXE = ffbuild/bin2c$(HOSTEXESUF)
BIN2C = $(BIN2CEXE)
+# $(call INSTALL_FILES, install options, files, destination)
+INSTALL_FILES = $(INSTALL) $(1) $(2) "$(3)"
+
ifndef V
Q = @
ECHO = printf "$(1)\t%s\n" $(2)
@@ -27,7 +30,7 @@ M = @$(call ECHO,$(TAG),$@);
$(foreach VAR,$(BRIEF), \
$(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
-$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_PATH)/%=%)); $(INSTALL))
+INSTALL_FILES = @$(foreach F,$(2),printf 'INSTALL\t%s -> %s\n'
"$(F:$(SRC_PATH)/%=%)" "$(3)"; )$(INSTALL) $(1) $(2) "$(3)"
endif
# Prepend to a recursively expanded variable without making it simply expanded.
diff --git a/ffbuild/library.mak b/ffbuild/library.mak
index c11ab4cdce..ff91dd795e 100644
--- a/ffbuild/library.mak
+++ b/ffbuild/library.mak
@@ -112,27 +112,27 @@ clean::
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
$(Q)mkdir -p "$(SHLIBDIR)"
- $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
+ $$(call INSTALL_FILES,-m 755,$$<,$(SHLIBDIR)/$(SLIB_INSTALL_NAME))
ifneq ($(STRIPTYPE),nostrip)
$$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
endif
$(Q)$(foreach F,$(SLIB_INSTALL_LINKS),(cd "$(SHLIBDIR)" && $(LN_S)
$(SLIB_INSTALL_NAME) $(F));)
- $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644
$(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)")
+ $(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(call INSTALL_FILES,-m
644,$(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%),$(SHLIBDIR)))
$(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)")
- $(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644
$(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)")
+ $(if $(SLIB_INSTALL_EXTRA_LIB),$$(call INSTALL_FILES,-m
644,$(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%),$(LIBDIR)))
install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
$(Q)mkdir -p "$(LIBDIR)"
- $$(INSTALL) -m 644 $$< "$(LIBDIR)"
+ $$(call INSTALL_FILES,-m 644,$$<,$(LIBDIR))
$(LIB_INSTALL_EXTRA_CMD)
install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
$(Q)mkdir -p "$(INCINSTDIR)"
- $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
+ $$(call INSTALL_FILES,-m 644,$$^,$(INCINSTDIR))
install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc
$(Q)mkdir -p "$(PKGCONFIGDIR)"
- $$(INSTALL) -m 644 $$^ "$(PKGCONFIGDIR)"
+ $$(call INSTALL_FILES,-m 644,$$^,$(PKGCONFIGDIR))
uninstall-libs::
-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
diff --git a/fftools/Makefile b/fftools/Makefile
index 01b16fa8f4..bf1a8f1e29 100644
--- a/fftools/Makefile
+++ b/fftools/Makefile
@@ -86,7 +86,7 @@ install-progs-$(CONFIG_SHARED): install-libs
install-progs: install-progs-yes $(AVPROGS)
$(Q)mkdir -p "$(BINDIR)"
- $(INSTALL) -c -m 755 $(AVPROGS) "$(BINDIR)"
+ $(call INSTALL_FILES,-c -m 755,$(AVPROGS),$(BINDIR))
uninstall: uninstall-progs
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
