From patchwork Fri Feb 8 19:36:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Turner X-Patchwork-Id: 2118131 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id A3492DFE75 for ; Fri, 8 Feb 2013 19:34:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 900BBE6313 for ; Fri, 8 Feb 2013 11:34:43 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BDCEE5EC0 for ; Fri, 8 Feb 2013 11:34:05 -0800 (PST) Received: by mail-pa0-f54.google.com with SMTP id fa10so2258332pad.27 for ; Fri, 08 Feb 2013 11:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=w+xU6YQkxDfu3CiAbAReuQ8pzUgLvvwYlWTaOYH8hsI=; b=r7lavTpGJ4FBkuIq/GBzcT5qIBo0HC0Wyz4fI6evJE8wbsk/QNCni7AyKIdULCuc/8 CRNOebrQAcbCkXrLOWQISmsAO2Pf8wABON/DBLSp3zZ3nf8Z9yTRZFsU0U+L67fIld4j AgxRU2IL/YfMHVioRVE1YHmnBTblYcIC8dZ8Ny+bbZj3cPNtPJ/2HrjsWxLQyD4u5ozA G3OmBKCsNXXt+v4GjCbqtbuxhDpavw0cjeZjIO9vG6ovQXgSuwtMy2nyUToK8Sn8G8U3 PvsqPbtM+RHk1vugPA8gcm8nTBx0V3luCZjt+O+WCm6KAYdsm2DSCZ174fb+RbrTWYsF Zdfw== X-Received: by 10.66.89.132 with SMTP id bo4mr20156318pab.62.1360352044790; Fri, 08 Feb 2013 11:34:04 -0800 (PST) Received: from localhost (c-76-105-165-193.hsd1.or.comcast.net. [76.105.165.193]) by mx.google.com with ESMTPS id d8sm56684198pax.23.2013.02.08.11.34.02 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 08 Feb 2013 11:34:03 -0800 (PST) From: Matt Turner To: intel-gfx@lists.freedesktop.org Date: Fri, 8 Feb 2013 11:36:54 -0800 Message-Id: <1360352214-17697-2-git-send-email-mattst88@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1360352214-17697-1-git-send-email-mattst88@gmail.com> References: <1360352214-17697-1-git-send-email-mattst88@gmail.com> Subject: [Intel-gfx] [PATCH intel-gpu-tools 2/2] quick_dump: Makefile.am best practices and fix distcheck X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org A few changes - Put CPPFLAGS in AM_CPPFLAGS instead of a per-target CFLAGS var; - Use _LIBS/_CFLAGS from pkg-config instead of hard-coded values; - List non-generated scripts in dist_bin_SCRIPTS; - Add chipset.py to the run that implicitly generates it, which fixes distcheck. --- tools/quick_dump/Makefile.am | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am index e89a115..42ab140 100644 --- a/tools/quick_dump/Makefile.am +++ b/tools/quick_dump/Makefile.am @@ -1,17 +1,19 @@ +AM_CPPFLAGS = -I$(top_srcdir)/lib $(PYTHON_CPPFLAGS) $(DRM_CFLAGS) + BUILT_SOURCES = chipset_wrap_python.c -bin_SCRIPTS = quick_dump.py chipset.py reg_access.py +dist_bin_SCRIPTS = quick_dump.py reg_access.py +bin_SCRIPTS = chipset.py lib_LTLIBRARIES = I915ChipsetPython.la -I915ChipsetPython_la_CFLAGS = -I$(top_srcdir)/lib $(PYTHON_CPPFLAGS) $(CFLAGS) -I/usr/include/libdrm/ -I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) -lpciaccess +I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) $(PCIACCESS_LIBS) I915ChipsetPython_la_SOURCES = chipset_wrap_python.c intel_chipset.c \ $(top_srcdir)/lib/intel_drm.c \ $(top_srcdir)/lib/intel_pci.c \ $(top_srcdir)/lib/intel_reg_map.c \ $(top_srcdir)/lib/intel_mmio.c -chipset_wrap_python.c: chipset.i +chipset_wrap_python.c chipset.py: chipset.i $(SWIG) $(AX_SWIG_PYTHON_OPT) -I/usr/include -I$(top_srcdir)/lib -o $@ $< all-local: I915ChipsetPython.la