[PATCH intel-gpu-tools 5/6] tools: minor compiler flags reorg and layout changes

[Gaetan Nadon]

Use dist_bin_SCRIPTS. Use $(top_srcdir)

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 tools/Makefile.am |   78 ++++++++++++++++++++++++----------------------------
 1 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4969a11..220c2b3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,48 +1,42 @@
-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_SCRIPTS = intel_gpu_abrt \
-	$(NULL)
-
-noinst_PROGRAMS = \
-	intel_dump_decode \
-	intel_lid \
-	$(NULL)
-
-intel_dump_decode_SOURCES = \
-	intel_dump_decode.c \
-	intel_decode.c \
+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
+
+noinst_PROGRAMS = 			\
+	intel_dump_decode 		\
+	intel_lid
+
+dist_bin_SCRIPTS = intel_gpu_abrt
+
+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_decode.c 			\
 	intel_decode.h
 
-intel_error_decode_SOURCES = \
-	intel_error_decode.c \
-	intel_decode.c \
+intel_error_decode_SOURCES = 		\
+	intel_error_decode.c 		\
+	intel_decode.c 			\
 	intel_decode.h
 
-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
-- 
1.7.5.4