[PATCH intel-gpu-tools v2 3/6] lib: fix include directives, alphabetize sources

Gaetan Nadon memsize at videotron.ca
Fri Jan 6 15:25:07 PST 2012


Headers are found under top_srcdir/...
Haeders are CPP flags, not C Flags

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 lib/Makefile.am |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ca93410..9607fcb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,28 +1,25 @@
-NULL=#
 
-AM_CFLAGS = $(CWARNFLAGS) -I$(srcdir)/..
-libintel_tools_la_SOURCES = \
-	intel_batchbuffer.h \
-	intel_batchbuffer.c \
-	intel_chipset.h \
-	intel_gpu_tools.h \
-	intel_mmio.c \
-	intel_pci.c \
-	intel_reg.h \
-	i915_3d.h \
-	i915_reg.h \
-	i830_reg.h \
-	intel_reg_map.c \
-	intel_drm.c \
-	instdone.c \
-	instdone.h \
-	drmtest.h \
-	drmtest.c \
-	debug.h \
-	$(NULL)
-
-AM_CFLAGS += $(DRM_CFLAGS)
+noinst_LTLIBRARIES = libintel_tools.la
 
+AM_CPPFLAGS = -I$(top_srcdir)
+AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS)
 
-noinst_LTLIBRARIES = libintel_tools.la
+libintel_tools_la_SOURCES = 	\
+	debug.h			\
+	drmtest.c		\
+	drmtest.h		\
+	i830_reg.h		\
+	i915_3d.h		\
+	i915_reg.h		\
+	instdone.c		\
+	instdone.h		\
+	intel_batchbuffer.c	\
+	intel_batchbuffer.h	\
+	intel_chipset.h		\
+	intel_drm.c		\
+	intel_gpu_tools.h	\
+	intel_mmio.c		\
+	intel_pci.c		\
+	intel_reg.h		\
+	intel_reg_map.c
 
-- 
1.7.5.4



More information about the xorg-devel mailing list