diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2010-02-11 10:08:07 -0500 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2010-02-11 10:08:07 -0500 |
commit | fd036680c210266ba535b0204cac38e503371398 (patch) | |
tree | ff1527636b2b3d500719c8d2681a04daaf54ede0 | |
parent | Implement XSetDeviceMode request handler (diff) | |
download | xf86-input-evdev-fd036680c210266ba535b0204cac38e503371398.tar.gz xf86-input-evdev-fd036680c210266ba535b0204cac38e503371398.tar.bz2 xf86-input-evdev-fd036680c210266ba535b0204cac38e503371398.zip |
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 759c1ae..e2716fa 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages. We need to be able to override sdkdir # to satisfy silly distcheck requirements. PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) -XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" + AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"], [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`]) diff --git a/src/Makefile.am b/src/Makefile.am index 2b6c800..4f0937e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +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) + +AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version |