CFLAGS is a user variable.
---
configure.ac | 3 ---
src/Makefile.am | 1 +
tools/Makefile.am | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4483890..82500e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,9 +105,6 @@ PKG_CHECK_MODULES(XORG16, [xorg-server >= 1.6],
AM_CONDITIONAL(HAVE_PROPERTIES, [ test "$HAVE_PROPERTIES" = "yes" ])
AC_SUBST(HAVE_PROPERTIES)
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
-
# Checks for libraries.
AC_ARG_ENABLE(tools,
AC_HELP_STRING([--enable-tools], [Build synclient and syndaemon
[[default=auto]]]),
diff --git a/src/Makefile.am b/src/Makefile.am
index fc7d20a..e7ee375 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,7 @@
@driver_n...@_drv_ladir = @inputdir@
INCLUDES=-I$(top_srcdir)/include/
+AM_CFLAGS = $(XORG_CFLAGS)
@driver_n...@_drv_la_sources = @[email protected] synapticsstr.h \
alpscomm.c alpscomm.h \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 65820ff..75d22c9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = \
synclient \
syndaemon
-INCLUDES=-I$(top_srcdir)/include/
+INCLUDES=-I$(top_srcdir)/include/ -I$(sdkdir)
synclient_SOURCES = synclient.c
synclient_LDFLAGS = -lm $(XI_LIBS)
--
1.6.6
_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel
