From 91a01e034858dacd41f0a847ba90996db87c44be Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 10 Jan 2012 20:30:23 -0500 Subject: [PATCH] tools: use correct src and build location Headers are found under top_srcdir/ Headers are CPP flags, not C Flags libintel_tools.la is located in top_builddir. Use dist_bin_SCRIPTS so it is included in tarball Line-up the line continuation characters Acked-by: Ben Widawsky Signed-off-by: Gaetan Nadon --- tools/Makefile.am | 65 +++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 51ed3a8f..7ee0a47d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,44 +1,37 @@ -bin_PROGRAMS = \ - intel_disable_clock_gating \ - intel_audio_dump \ - intel_backlight \ - intel_bios_dumper \ - intel_bios_reader \ - intel_error_decode \ - intel_gpu_top \ - intel_gpu_time \ - intel_gtt \ - intel_stepping \ - intel_reg_checker \ - intel_reg_dumper \ - intel_reg_snapshot \ - intel_reg_write \ - intel_reg_read \ - forcewaked \ - $(NULL) +bin_PROGRAMS = \ + intel_disable_clock_gating \ + intel_audio_dump \ + intel_backlight \ + intel_bios_dumper \ + intel_bios_reader \ + intel_error_decode \ + intel_gpu_top \ + intel_gpu_time \ + intel_gtt \ + intel_stepping \ + intel_reg_checker \ + intel_reg_dumper \ + intel_reg_snapshot \ + intel_reg_write \ + intel_reg_read \ + forcewaked -bin_SCRIPTS = intel_gpu_abrt \ - $(NULL) +noinst_PROGRAMS = \ + intel_dump_decode \ + intel_lid -noinst_PROGRAMS = \ - intel_dump_decode \ - intel_lid \ - $(NULL) +dist_bin_SCRIPTS = intel_gpu_abrt -intel_dump_decode_SOURCES = \ +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib +AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) +LDADD = $(top_builddir)/lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) + +intel_dump_decode_SOURCES = \ intel_dump_decode.c -intel_error_decode_SOURCES = \ +intel_error_decode_SOURCES = \ intel_error_decode.c -intel_bios_reader_SOURCES = \ - intel_bios_reader.c \ +intel_bios_reader_SOURCES = \ + intel_bios_reader.c \ intel_bios.h - -EXTRA_DIST = $(bin_SCRIPTS) - -LDADD = ../lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) - -AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ - -I$(srcdir)/.. \ - -I$(srcdir)/../lib