[PATCH video-vesa] config: Move compiler flags from configure.ac to Makefile.am

[Gaetan Nadon]

Remove unused XORG_INCS variable.
Remove unused INCLUDES='-I$(top_srcdir)/src'
This statement is redundant and not used in the makefile

Remove unrequired '-I$(top_srcdir)/src'
The current dir is already included by default in the makefile
top_builddir = ..
DEFAULT_INCLUDES = -I. -I$(top_builddir)

Move compiler flags from configure.ac to Makefile.am
CFLAGS is an automake defined variable that should not be set
by the module. It should not be AC_SUBST either, it already is.
Use AM_CFLAGS in Makefile.am. This will allow the user to override
the flags as they will be in the right order.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac    |    5 -----
 src/Makefile.am |    3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index ff4713d..51d9d33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,11 +93,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
 fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
 
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
-AC_SUBST([INCLUDES])
-
 # Checks for libraries.
 
 # Checks for header files.
diff --git a/src/Makefile.am b/src/Makefile.am
index 88da8a2..dc702f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,9 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+
+AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
+
 vesa_drv_la_LTLIBRARIES = vesa_drv.la
 vesa_drv_la_LDFLAGS = -module -avoid-version
 vesa_drv_ladir = @moduledir@/drivers
-- 
1.6.0.4

Applies to these modules:
./driver/xf86-video-apm
./driver/xf86-video-ark
./driver/xf86-video-dummy
./driver/xf86-video-qxl