summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2013-03-10 11:42:19 +0100
committerCedric Bail <cedric.bail@free.fr>2013-03-10 20:33:57 +0900
commitcf26a36fec320fd7905dcd249ea3ca6eaa780ec5 (patch)
treeded46687ed53803af8259f3dfc42fa8c7d029b63
parent5fc7829c9675a0fae60332934b60b3734dee20ad (diff)
evil: cleanup compiler flags.
- Pass EVIL_CFLAGS to C++ compiled files (needed for -DEF_EVIL_BUILD) - Some warning flags should not be passed to C++ compiler, so put them in another variable
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile_Evil.am4
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index fa78b98115..01ed6e2af8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,8 @@ AC_SUBST([EVIL_DLFCN_LIBS])
519 519
520EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1" 520EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
521# TODO: should we have these at EFL (global?) 521# TODO: should we have these at EFL (global?)
522EVIL_CFLAGS="-Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls ${EVIL_CFLAGS}" 522# Note: these warnings should not be used with C++ code
523EVIL_CFLAGS_WRN="-Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
523EVIL_CXXFLAGS="${EVIL_CXXFLAGS}" 524EVIL_CXXFLAGS="${EVIL_CXXFLAGS}"
524 525
525if test "x${have_win32}" = "xyes" ; then 526if test "x${have_win32}" = "xyes" ; then
@@ -528,6 +529,7 @@ if test "x${have_win32}" = "xyes" ; then
528fi 529fi
529 530
530AC_SUBST([EVIL_DLFCN_CPPFLAGS]) 531AC_SUBST([EVIL_DLFCN_CPPFLAGS])
532AC_SUBST([EVIL_CFLAGS_WRN])
531AC_SUBST([EVIL_CXXFLAGS]) 533AC_SUBST([EVIL_CXXFLAGS])
532 534
533### Checks for linker characteristics 535### Checks for linker characteristics
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index c60edcfa23..6aac926808 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -95,8 +95,8 @@ else
95lib_evil_libevil_la_SOURCES += lib/evil/evil_link_xp.cpp 95lib_evil_libevil_la_SOURCES += lib/evil/evil_link_xp.cpp
96endif 96endif
97 97
98lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ 98lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ @EVIL_CFLAGS_WRN@
99lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ 99lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ @EVIL_CFLAGS@
100lib_evil_libevil_la_LIBADD = @EVIL_LIBS@ 100lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
101lib_evil_libevil_la_DEPENDENCIES = @EVIL_INTERNAL_LIBS@ 101lib_evil_libevil_la_DEPENDENCIES = @EVIL_INTERNAL_LIBS@
102lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 102lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@