diff options
| author | Julien Cristau <jcristau@debian.org> | 2010-01-08 16:22:51 +0000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-11 10:35:06 +1000 |
| commit | 7a43ba2b9d35bc89b94964ce7f95c9299b978b7d (patch) | |
| tree | 171206188f5d6568b53f13c4d3d61dd1822e83be | |
| parent | a1776829076a6774571fa82ea4adde03c3c6c5b4 (diff) | |
configure: don't clobber CFLAGS
CFLAGS is a user variable.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | 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_NAME@_drv_ladir = @inputdir@ INCLUDES=-I$(top_srcdir)/include/ +AM_CFLAGS = $(XORG_CFLAGS) @DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c 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) |