From patchwork Wed Nov 5 18:11:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 5237241 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E31D49F295 for ; Wed, 5 Nov 2014 18:12:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43BDB200F4 for ; Wed, 5 Nov 2014 18:11:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2D82120122 for ; Wed, 5 Nov 2014 18:11:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D8FD6E9C6; Wed, 5 Nov 2014 10:11:54 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com [74.125.82.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 351336E9C8 for ; Wed, 5 Nov 2014 10:11:53 -0800 (PST) Received: by mail-wg0-f54.google.com with SMTP id n12so1566279wgh.41 for ; Wed, 05 Nov 2014 10:11:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=QNNZF5td0Job/JPoHs5eF7j8rILFtpPd2GvpcJcK9BE=; b=O1V49lHiDQPQKppMitrDMxcgRi2RcTm6NuNKtaya67WWCYvO70Lh4rgzYD1+kiBFJ4 eRH8uFNj8etmoNUqdSQcb+BtLTr4uSOnOEUN+eDDF2Mi4F4eQv2neQ2aV9dR46t8BoRu CHH6ic0vKqL13Hd5GzxNZHUTBlHuccJ8GV8S8fEe7wltU+Dvqg3JdUapeDT6s8CY6tU6 7TjaxGXtskyQpdPW8Xu4odKAd59x2mwvwWmSBjVWozeGZe39p9lPPFA4XDMq4od8tJDU jfxfQ2lxyQXx4TcBhuQLcK2X/tHUh6s2asA6/inJKRbfq5Q9rRHYE6xcFCO3DziOH++Z 7fBg== X-Gm-Message-State: ALoCoQmAiYOdznrUKp1dQXeCDmq+Y3DwcxQEkSBWhbaSPiTLjx46vUgUVQuJhF6kQIhlRHXZ1PPH X-Received: by 10.180.149.169 with SMTP id ub9mr7924064wib.73.1415211112128; Wed, 05 Nov 2014 10:11:52 -0800 (PST) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id rx8sm4914008wjb.30.2014.11.05.10.11.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Nov 2014 10:11:51 -0800 (PST) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Wed, 5 Nov 2014 18:11:50 +0000 Message-Id: <1415211110-8786-1-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1415204250-27125-1-git-send-email-thomas.wood@intel.com> References: <1415204250-27125-1-git-send-email-thomas.wood@intel.com> Subject: [Intel-gfx] [PATCH i-g-t v2] tools/quick_dump: don't include generated sources in the distribution X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This also ensures that "make dist" works even if SWIG is not available. BUILT_SOURCES is not required because the files are already explicit dependencies of other rules. v2: make sure SWIG is not invoked with the incorrect output filename Signed-off-by: Thomas Wood --- tools/quick_dump/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am index e7e1f62..641066d 100644 --- a/tools/quick_dump/Makefile.am +++ b/tools/quick_dump/Makefile.am @@ -1,13 +1,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(PYTHON_CPPFLAGS) $(DRM_CFLAGS) $(CAIRO_CFLAGS) -I$(top_srcdir) -BUILT_SOURCES = chipset_wrap_python.c - dist_bin_SCRIPTS = quick_dump.py reg_access.py bin_SCRIPTS = chipset.py lib_LTLIBRARIES = I915ChipsetPython.la I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) -I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c +I915ChipsetPython_la_SOURCES = chipset_macro_wrap.c +nodist_I915ChipsetPython_la_SOURCES = chipset_wrap_python.c I915ChipsetPython_la_LIBADD = \ $(top_builddir)/lib/libintel_tools.la \ $(PCIACCESS_LIBS) \ @@ -15,7 +14,9 @@ I915ChipsetPython_la_LIBADD = \ $(CAIRO_LIBS) \ $(NULL) -chipset_wrap_python.c chipset.py: chipset.i +chipset.py: chipset_wrap_python.c + +chipset_wrap_python.c: chipset.i $(AM_V_GEN)$(SWIG) $(AX_SWIG_PYTHON_OPT) -I/usr/include -I$(top_srcdir)/lib -o $@ $< all-local: I915ChipsetPython.la @@ -26,4 +27,4 @@ EXTRA_DIST = $(QUICK_DUMP_EXTRA_DIST) \ base_interrupt.txt base_other.txt base_power.txt base_rings.txt \ quick_dump.py \ reg_access.py \ - chipset.i chipset.py + chipset.i