summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-02-08 19:36:54 +0000
committerBen Widawsky <ben@bwidawsk.net>2013-02-08 12:04:43 -0800
commit05795daebf3b4d37b89422a2fca0236ee6a26b73 (patch)
tree447db08d37b15ce6900b401d6a7a396825962399 /tools
parentc73eab9f4043ee2c9be00250190a2833bf307aee (diff)
quick_dump: Makefile.am best practices and fix distcheck
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. Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/quick_dump/Makefile.am10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am
index e89a1154..42ab1408 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