diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-02-16 10:37:21 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-02-16 10:37:21 -0500 |
| commit | a3e03bb23bf7a92bf20d51eebe692e0a4f667065 (patch) | |
| tree | 8f00f624008aac927f0a37c3a6ddd160d1006f29 | |
| parent | 8198d1490959d49573790405e205a471ac7a5b98 (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 | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index cda2349..9d88411 100644 --- a/configure.ac +++ b/configure.ac @@ -69,10 +69,6 @@ AC_SUBST([XCURSORPATH_LIST]) # Check for X PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto) AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes]) -XCURSOR_CFLAGS="$CWARNFLAGS $XCURSOR_CFLAGS" -AC_SUBST(XCURSOR_CFLAGS) -AC_SUBST(XCURSOR_LIBS) - dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT diff --git a/src/Makefile.am b/src/Makefile.am index a8734f3..a55b8d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,8 +6,11 @@ ICONDIR=@ICONDIR@ XCURSORPATH=@XCURSORPATH@ libXcursor_la_LIBADD = $(XCURSOR_LIBS) -AM_CFLAGS = $(XCURSOR_CFLAGS) \ - -DICONDIR=\"$(ICONDIR)\" -DXCURSORPATH=\"$(XCURSORPATH)\" +AM_CFLAGS = \ + $(XCURSOR_CFLAGS) \ + $(CWARNFLAGS)\ + -DICONDIR=\"$(ICONDIR)\" \ + -DXCURSORPATH=\"$(XCURSORPATH)\" INCLUDES = -I$(top_srcdir)/include/X11/Xcursor |