From patchwork Tue Oct 3 04:24:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5390 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp2273241jan; Mon, 2 Oct 2017 21:24:36 -0700 (PDT) X-Received: by 10.223.196.167 with SMTP id m36mr5029840wrf.225.1507004676409; Mon, 02 Oct 2017 21:24:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507004676; cv=none; d=google.com; s=arc-20160816; b=Uv42uIREI4MEatDOzFYvPsqRNP3UsxA6eGWgWwNqITuEh+Il6pz5IacK2VIdZ76pLt jaxZPPrhQrC6WjDF9ogM0/+oU2aOihp9JsUPMbODHrTicbZ/ICzf5msU+b6nKwo2HHvN IQ8AEy+hw3pIL7vPFkQTDmDBbQGkLAGH9lJ9rbSeNJh5coZlkTYnq+6tO7NPohMbnpfX vkK/EDuMIQhnco9H3HTp0axmt4FjpD//j4EF5SqDnEIWB5FHjLkd4lrsPAw1ZgFOEnHB RGe4xbKE19QkWAiVFJ0q5anDYVO1vtIwbDs/ef02qLdzxy6e+f9N1sw1HV3hlKnEAF3S KJ+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=ZGC/LGHR2uklQP4LO4pc/O7WYLivrZVR0C4jsVGF2co=; b=bbPn+Ivh6IC+CVR/QxS25n9W9pjDOuGnYjL/CWuWgG0rex+qDk6gUM7n1kYq6kwDTn DBJaafP4Kndb1zKS0Ofa5pVtxkB0IArC26pESZamLd9QtW4MIB8tdpkSVt33ahjXezNa 9QWoOc4Oh+vqC9MdMMt21ArtbwIwdEGZQF/EWNOcyMpb6pZy5BZsykFbHheEGLhbgo1i MVs+RgCSJky1CXdNb7kC8S2sEqn9pVd/otkeEHuur96Un1Sptcf4nqCEjV2LluAfttst 2M5tswxoiJF6K4t6gCAaMD3kGUDxrlMj7zX3T3N5NUA/bMOp4gML35hx9wKtbd+gKsgm RggQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gBTrMR40; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w5si9624156wre.204.2017.10.02.21.24.35; Mon, 02 Oct 2017 21:24:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gBTrMR40; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D99E689CF3; Tue, 3 Oct 2017 07:24:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B48016899B7 for ; Tue, 3 Oct 2017 07:24:10 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id z14so5220512qkg.3 for ; Mon, 02 Oct 2017 21:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=D7Ieq22ceus9pKAkRk36ftWBPnx351x5vGEUi9JWd18=; b=gBTrMR40a55k9MjIkyvpMh6CbljqIn3jn3wx8i/hQxM0WnMSnc9GwN9H+jCE4+qtbz NcHpPeyQBsjUW3lxDV5ZzDH7+X3Fwxqgp/B10+Q/79C7WLIDXHcxzeCinSswGkvhVQHa sjOCQ0vvcQHjkh7p+OakKA0mCS3Muk7hjwBy/Q2IDWeXpTTHD9fwRYw7fLvnm11u95Yv qjcmDRV/kJDX0PEmALFJFDWiW15Fclwo4jy3OexZv5DgRhdXgqDeUCeQC30AiGDVneC/ cchwAZoNzO8+Yf17gwRTPj+asmkiWPn/SC5zwbPLsCVArCkOlbuHRj4QaD7NzXYjyqzW nwlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=D7Ieq22ceus9pKAkRk36ftWBPnx351x5vGEUi9JWd18=; b=lyHfc/h51O8IEtPKTPxIdF2b4NwqeO7W13psMsa0F2u+WcCx/vd7WlSSHV4VGV8HY/ E+ErwaT37jH5CpWJOZiQI6B5OZ+0U1z/DnGby2WGPDbqcN7VewEUW2romjKuJ10TOR9o wrChfIqSYdEcaIP2VdRoXy+PdmMx7NnCD1rHOGxtMwm4E2LLTNAdPSWM+ghja4SLVWVa PjuHd30aVC1f2xyfu9BRT1zi1+aD4hCcfvgyfecrml5f9OT9JauhZl7+ABXQ2YrUZibi gAJ7k0rV12RurjXMfH/3RJ6lsuf/EpwAIQFBAlQcq/SkvueRBqCBui4km2ADsry7JMVu lb6Q== X-Gm-Message-State: AMCzsaXkkPR1dCxEPcKvg4PZIFyUfQK5VNKYhignZ6ohenhTLsxCnpD5 OhfIWiso4GAwabF9Mg4tPSWJkg== X-Google-Smtp-Source: AOwi7QCrJm8P36ZMw4sEMeHn7I0n+SHFkcJZHJ/AZ+iuX/rRffl6zJ0xYYy6nLHcNGdy3w/UUs0MSQ== X-Received: by 10.55.185.194 with SMTP id j185mr10544984qkf.101.1507004663829; Mon, 02 Oct 2017 21:24:23 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id k188sm411028qkc.64.2017.10.02.21.24.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Oct 2017 21:24:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Oct 2017 01:24:12 -0300 Message-Id: <20171003042412.4852-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] build: add install targets for the examples X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Split it off from install-data. Among other things, this prevents spamming triplicate log lines during install. Signed-off-by: James Almer --- 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/%)