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 | daf147d10f9eb93c08c4ba0dfe4d61e87a41ddf3 (patch) | |
| tree | 66bbaf28374e0bc8fb5f3978105930daa4abaff8 | |
| parent | 5e1dacfd0ce3298f8c3d7660af0f8ca995b867b2 (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 | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 69b1198..4b7ea01 100644 --- a/configure.ac +++ b/configure.ac @@ -112,9 +112,6 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto $REQUIRED_MODULES) -XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" -AC_SUBST([XORG_CFLAGS]) - # Checks for libraries. # Checks for header files. diff --git a/src/Makefile.am b/src/Makefile.am index 823a9db..80a5adc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,8 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) + kbd_drv_la_LTLIBRARIES = kbd_drv.la kbd_drv_la_LDFLAGS = -avoid-version -module kbd_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h atKeynames.h |