summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2010-04-17 01:39:23 +0200
committerJulien Cristau <jcristau@debian.org>2010-04-17 01:39:23 +0200
commitb22d830a4e1c609a709e71c306a3b3a8ff8a6078 (patch)
treede1b3d4d1fa8ee17a3635f6ef778f07791b38d70
parent1cba87aab183eb3846757a0ee0828e3eb119a6e6 (diff)
Don't clobber CFLAGS
CFLAGS is a user variable, don't set it from configure.
-rw-r--r--configure.ac3
-rw-r--r--shared/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--tools/Makefile.am2
4 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 472c705..6c29dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,9 +138,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.6.0],
[AC_DEFINE([NO_MOUSE_MODULE], 1,
[Do not include built-in mouse module fallback])])
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
-
# Checks for libraries.
# Checks for header files.
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 33c5862..c1b6ca9 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -23,5 +23,5 @@ lib@DRIVER_NAME@_la_SOURCES = @DRIVER_NAME@_defs.h \
@DRIVER_NAME@_client.c @DRIVER_NAME@_client.h \
@DRIVER_NAME@_proto.c @DRIVER_NAME@_proto.h
-
+AM_CPPFLAGS = $(XORG_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6848537..7e6ea36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
@DRIVER_NAME@_drv_la_LIBADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la
@DRIVER_NAME@_drv_ladir = @inputdir@
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c xf86OSmouse.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8c40369..581ad65 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@
bin_PROGRAMS = @DRIVER_NAME@_detect
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@DRIVER_NAME@_detect_SOURCES = vmmouse_detect.c
@DRIVER_NAME@_detect_LDADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la