diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-01-28 15:11:03 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-01-28 15:11:03 -0800 |
| commit | 9fc922cb363f6b65404ef5484c24a91ac64e54f5 (patch) | |
| tree | 137740de57c505a1ab557a2f4e5c1f444f7f5499 | |
| parent | 81041cb6d6c417530549792e38de3ccabfc5aaeb (diff) | |
Add XORG_CWARNFLAGS, clean up CFLAGS usage
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 9716f0a..f3a655d 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CHANGELOG +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.2) @@ -45,6 +45,7 @@ AM_CONFIG_HEADER([config.h]) AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) @@ -82,9 +83,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 7724f1d..7d65e03 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,3 +29,6 @@ @DRIVER_NAME@_drv_ladir = @inputdir@ @DRIVER_NAME@_drv_la_SOURCES = xf86Summa.c + +AM_CPPFLAGS = -I$(top_srcdir)/src +AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) |