From patchwork Thu Oct 5 03:55:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5420 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.76 with SMTP id m12csp1586717jah; Wed, 4 Oct 2017 20:55:59 -0700 (PDT) X-Received: by 10.223.197.13 with SMTP id q13mr23971932wrf.80.1507175759224; Wed, 04 Oct 2017 20:55:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507175759; cv=none; d=google.com; s=arc-20160816; b=X3x5FvZS8NU2czUZyBVjbDWWpqd99u2NszyMxJm5jyuDMHJN8A6EDvXeRdnSn2gCiu fDcTjY3tj4ud/KG7Ev5bImPgzW5l2O+41y6HWe2uBRYCObHmsJI4xqAEZVWxHvlZTIAI upXUI5DoT6AAlsKg9wO0ShR7HUFAKOzn2Pd0aGV6NHx0biSOuzbs+tLcynjsY+caT+4p zC2RuXK2Oz0iSdwFg8VW49yAyEM2CtnXlGlYSGOTaaux/QhdAt3ece9mMSwONSDI6pEt P0MN3kykHx0vykFgNt+KdxqKUWvxjBjPsQXJqaTiK5YJjO4XGVEJhBwPq2NWTHeCHrkC 2yQg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=NnbypTv4gvg9edgwHykWJ5ORnRuSaGZ1AuMvjg3eUXM=; b=jXC/vFs2Kph4+0f3hMIRv6Tob2i70PMLWFi5KFvoYVOpDPczdExIib0ocnUGZbwt/x vS1sKxReeazJ3g8jEq/ErvjLgaVmBSlBX0SrQRDf/+hmBHgrXRMHRd3aIOAe7++cxGBn cTIdHHj78aq2nX0bBGfS+C6Uhj7D+83c9yVOhttNl/QQCfmlD9N4ctEpRryAtPTYG7aA I/j30PBn7vFB9yfqPiDHeMOwwgEREwNilMKQPeet/7q0EdzgVbXz+DdT6XennN7F6NLR DQWlp7AgLkWL5nECt5WJsLTq2HIdoAektCmAwAmwMEzrlHevydYwhICVe5eNntDrjRwW Hydw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ok47fNeG; 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 b17si13637327wrd.359.2017.10.04.20.55.58; Wed, 04 Oct 2017 20:55:59 -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=ok47fNeG; 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 5091468A3F2; Thu, 5 Oct 2017 06:55:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B511268042A for ; Thu, 5 Oct 2017 06:55:32 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id z50so18108491qtj.4 for ; Wed, 04 Oct 2017 20:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=1b4vwxs87b/B36+tiB+4Okad5zFETmPIYx9OHOf6p2Q=; b=ok47fNeGXyHzc7AW479/g5j1M5VTLG+kubbsg9nxnaro65MPFMmi0lVkvP0W7VJRSq 1Ym+Fv9XqWsnQHFDPMtr1Thvj8gs2xVnhQF9sEGhhRDvBb29/N7QbVdNtsMU/Z4VY/l+ uJt1lU+A7L/wDcZRZyEJzpJl4sCnnFQf8VwTWdR65XqnYHEwR0TKkBlMNEqWHLJYU342 Gk0K3TwbflWDZp3wLhk4WXMCvbfyynIszDwQ+bNYGUIQm+69pghg1aEEob+efVSizzHZ h8Jl8ZoaYWQLJHBeYg8HjF4mmebKt3D8epcyQ9nqk209ad7gM9jmvCRzhl/1xe5h+J0o XB4A== 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:in-reply-to :references; bh=1b4vwxs87b/B36+tiB+4Okad5zFETmPIYx9OHOf6p2Q=; b=ZnPmhBvyQ5LETP/rjAoCB01faQPWZcd1mWlHzPOz80+8pwAbg3xZn+1YFep2LGfhTw E2EvhoZvPH/cg48V7MjlxL06bE5njIJJ6TaNrNhMzpVrEYyrJ/A1a5uvKI/p+miCFmQX /o/83FJdFPtlV5bJ6mv1v0613SD2MEhT62hQMk4e6o5P0+fz9AYyWWf0y6+cFIR/Zwea qC3bn9E9LzoaE5fwSjg1/qzltW9LF0X7xES0uIbFHWrtB3qkUnpf4A2kzQnjUU+r2EXO RBFal0/WCo7QkfkXaEMafoe4mFOIIBJlO4cy1vIezlJ1STKHQrSy0QRgMus4zyoMIPZr XSQQ== X-Gm-Message-State: AMCzsaXD30G8GnrcXWP5DU2L5PwK9ihm9eHkEYxUKC8YFCXX3SE4J7pL w/pdLZCh8yEXGO8zvu6POcDLGw== X-Google-Smtp-Source: AOwi7QBdI0UC8sKruXvf0j03EvvQTIf8dPav6KaBjRIvFNRLQKicUHiIBjApjAQRToxXDSCuL88HQg== X-Received: by 10.237.63.248 with SMTP id w53mr31189630qth.290.1507175746922; Wed, 04 Oct 2017 20:55:46 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id e18sm11316053qtc.59.2017.10.04.20.55.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 20:55:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Oct 2017 00:55:19 -0300 Message-Id: <20171005035519.2916-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171003042412.4852-1-jamrial@gmail.com> References: <20171003042412.4852-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] 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 --- Updated to apply after a recent merge. 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 af000d9ddb..58afd71b85 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -26,8 +26,8 @@ ALL_EXAMPLES := $(EXAMPLES) $(EXAMPLES-:%=doc/examples/%$(PROGSSUF)$(EXESUF)) ALL_EXAMPLES_G := $(EXAMPLES_G) $(EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) PROGS += $(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,$(EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o)) $(EXAMPLES_G): %$(PROGSSUF)_g$(EXESUF): %.o @@ -39,6 +39,18 @@ OBJDIRS += doc/examples DOXY_INPUT += $(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_EXAMPLES) $(ALL_EXAMPLES_G) $(RM) $(CLEANSUFFIXES:%=doc/examples/%)