summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-02-16 10:37:21 -0500
committerGaetan Nadon <memsize@videotron.ca>2010-02-16 10:37:21 -0500
commit1ad4c147bbaf1523adba2e9f4b289c0fb4360097 (patch)
treec9fb65f2dc106931dcab8ce6c8d218b4fa5b3d6a
parent253089a20d1496ef4102d06d603f1755e5e6e746 (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.ac1
-rw-r--r--src/Makefile.am6
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index c04c1cb..af1c0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ AC_PROG_LIBTOOL
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2])
-XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS"
XORG_CHECK_MALLOC_ZERO
diff --git a/src/Makefile.am b/src/Makefile.am
index f6517bd..edfb90a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,10 @@ lib_LTLIBRARIES = libXxf86dga.la
libXxf86dga_la_SOURCES = XF86DGA.c XF86DGA2.c
-AM_CFLAGS = -I $(top_srcdir)/include \
- $(XXF86DGA_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = -I $(top_srcdir)/include \
+ $(XXF86DGA_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS)
libXxf86dga_la_LDFLAGS = -version-number 1:0:0