diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-02-16 10:37:20 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-02-16 10:37:20 -0500 |
| commit | 6fdf532d7a7d1f72681ce76c6cad9baf2306f08a (patch) | |
| tree | 1a18d450a521452a8edf8e1e5001ba1208957ce0 | |
| parent | 4f4e3b731fb7bd1a646775ae096bf7fb2ab4fe29 (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 | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 08f3cd1..d179afd 100644 --- a/configure.ac +++ b/configure.ac @@ -41,9 +41,6 @@ AC_PROG_SED # Check for dependencies PKG_CHECK_MODULES(APPLEWM, x11 xext xextproto [applewmproto >= 1.4]) -APPLEWM_CFLAGS="$CWARNFLAGS $APPLEWM_CFLAGS" -AC_SUBST(APPLEWM_CFLAGS) -AC_SUBST(APPLEWM_LIBS) XORG_CHECK_MALLOC_ZERO diff --git a/src/Makefile.am b/src/Makefile.am index 72408b8..05b6022 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,16 @@ lib_LTLIBRARIES = libAppleWM.la libAppleWM_la_SOURCES = \ - applewm.c + applewm.c -libAppleWM_la_CFLAGS = @APPLEWM_CFLAGS@ @MALLOC_ZERO_CFLAGS@ \ +libAppleWM_la_CFLAGS = \ + $(APPLEWM_CFLAGS) \ + $(MALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) \ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \ - -I$(top_srcdir)/include -I$(top_srcdir)/include/X11 -I$(top_srcdir)/include/X11/extensions + -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/X11 \ + -I$(top_srcdir)/include/X11/extensions libAppleWM_la_LIBADD = @APPLEWM_LIBS@ |