summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-02-11 10:08:07 -0500
committerGaetan Nadon <memsize@videotron.ca>2010-02-11 10:08:07 -0500
commit4f56a25154eb876f33a46d29eed4be46bba814f2 (patch)
tree7237e346ded86a782734e173f33df7da8fd7fe99
parent547b489f70df72524f210cca990d1373cf80eb34 (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--Makefile.am2
-rw-r--r--configure.ac1
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 1613c4d..3f69bd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = xsm
SYSTEM_INIT_DIR = $(libdir)/X11/xsm
-AM_CFLAGS = $(XSM_CFLAGS) -DRSHCMD=\"@RSH@\" \
+AM_CFLAGS = $(XSM_CFLAGS) $(CWARNFLAGS) -DRSHCMD=\"@RSH@\" \
-DSYSTEM_INIT_FILE=\"$(SYSTEM_INIT_DIR)/system.xsm\"
xsm_LDADD = $(XSM_LIBS)
diff --git a/configure.ac b/configure.ac
index 68e302c..7ea08f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,6 @@ AC_CHECK_FUNC([putenv], [],
# Checks for pkg-config packages
PKG_CHECK_MODULES(XSM, x11 xt ice sm xaw7)
-XSM_CFLAGS="$CWARNFLAGS $XSM_CFLAGS"
XSM_LIBS="$XSM_LIBS"
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
AC_ARG_WITH(appdefaultdir,