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 | 3de065d6822206695c0aee2fd68cd9db8b2f3063 (patch) | |
| tree | 56d45f8b354670bee5b0c26748e0510c288c2a4a | |
| parent | 30d1089cffc9afd9fd468a6c30989e77c7884248 (diff) | |
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 | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 48d663e..ce6215d 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,6 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3.99.901] xproto $REQUIRED_MODULES) -XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" xorg_sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` AC_ARG_WITH(sdkdir, AC_HELP_STRING([--with-sdkdir=<path>], diff --git a/src/Makefile.am b/src/Makefile.am index 1f8898e..21cdf32 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 |