From: Matt Turner Subject: [PATCH intel-gpu-tools 2/2] quick_dump: Makefile.am best practices and fix distcheck Date: Fri, 8 Feb 2013 11:36:54 -0800 Message-ID: <1360352214-17697-2-git-send-email-mattst88@gmail.com> References: <1360352214-17697-1-git-send-email-mattst88@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: 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) In-Reply-To: <1360352214-17697-1-git-send-email-mattst88@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@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 -- 1.7.8.6