Split it off from install-data. Among other things, this prevents spamming triplicate log lines during install.
Signed-off-by: James Almer <jamr...@gmail.com> --- Makefile | 6 ++---- doc/examples/Makefile | 14 +++++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3007da50f7..4a1253a052 100644 --- a/Makefile +++ b/Makefile @@ -120,11 +120,9 @@ install: install-libs install-headers install-libs: install-libs-yes -install-data: $(DATA_FILES) $(EXAMPLES_FILES) $(EXAMPLE_MAKEFILE) - $(Q)mkdir -p "$(DATADIR)/examples" +install-data: $(DATA_FILES) + $(Q)mkdir -p "$(DATADIR)" $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)" - $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples" - $(INSTALL) -m 644 $(EXAMPLE_MAKEFILE:%=%.example) "$(DATADIR)/examples/Makefile" uninstall: uninstall-libs uninstall-headers uninstall-data diff --git a/doc/examples/Makefile b/doc/examples/Makefile index ff958d33c6..0d6dd05441 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -26,8 +26,8 @@ ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF ALL_DOC_EXAMPLES_G := $(DOC_EXAMPLES_G) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) PROGS += $(DOC_EXAMPLES) -EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README EXAMPLE_MAKEFILE := $(SRC_PATH)/doc/examples/Makefile +EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README $(EXAMPLE_MAKEFILE) $(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o)) $(DOC_EXAMPLES_G): %$(PROGSSUF)_g$(EXESUF): %.o @@ -39,6 +39,18 @@ OBJDIRS += doc/examples DOXY_INPUT += $(DOC_EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.c) +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" + +uninstall: uninstall-examples + +uninstall-examples: + $(RM) -r "$(DATADIR)/examples" + examplesclean: $(RM) $(ALL_DOC_EXAMPLES) $(ALL_DOC_EXAMPLES_G) $(RM) $(CLEANSUFFIXES:%=doc/examples/%) -- 2.14.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel