[PATCH 06/10] xf86-input-acecad: Don't explicitly use CFLAGS.

[Paulo Cesar Pereira de Andrade]

  Instead, set AM_CFLAGS to $(XORG_CFLAGS).

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
 configure.ac    |    3 ---
 src/Makefile.am |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6231da2..bf4c6eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,9 +79,6 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
-
 # Checks for libraries.
 
 # Checks for header files.
diff --git a/src/Makefile.am b/src/Makefile.am
index e234422..6307bd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,8 @@
 # -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)
+
 acecad_drv_la_LTLIBRARIES = acecad_drv.la
 acecad_drv_la_LDFLAGS = -module -avoid-version
 
-- 
1.6.1.3