merge: add a holdall variable

SVN revision: 78503

diff --git a/configure.ac b/configure.ac
index ea49b5406e3db49280dec99bbbd0d248168b8c13..a99357b351e52322d7b4f3cc233415c60261e897 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -298,7 +298,18 @@ AC_CHECK_TYPES([struct dirent], [have_dirent="yes"], [have_dirent="no"],
 
 AC_C_BIGENDIAN
 AC_C_INLINE
-# EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra])
+EFL_CHECK_COMPILER_FLAGS([EFL], [-Wall -Wextra -Wpointer-arith])
+case "${build_profile}" in
+   dev)
+     EFL_CHECK_COMPILER_FLAGS([EFL], [-Wshadow])
+     ;;
+
+   debug)
+     ;;
+
+   release)
+     ;;
+esac
 
 
 #### Checks for linker characteristics
@@ -402,7 +413,7 @@ AC_MSG_NOTICE([Eina checks])
 have_magic_debug="yes"
 have_safety_checks="yes"
 want_log="yes"
-case "$build_profile" in
+case "${build_profile}" in
    dev)
      with_max_log_level=""
      have_stringshare_usage="no"

diff --git a/m4/evil_windows.m4 b/m4/evil_windows.m4
index be79b8296bd8363d9e46e5dfe5f2890559045ba2..e64d68870d5d1691b83d5b279289d1a188c9a5bb 100644 (file)
--- a/m4/evil_windows.m4
+++ b/m4/evil_windows.m4
@@ -52,7 +52,7 @@ case "${_winver}" in
      ;;
 esac
 
-CPPFLAGS="${CPPFLAGS} ${EFL_WINDOWS_VERSION_CFLAGS}"
+EFL_CFLAGS="${EFL_CFLAGS} ${EFL_WINDOWS_VERSION_CFLAGS}"
 AC_SUBST([EFL_WINDOWS_VERSION_CFLAGS])
 AC_SUBST([_efl_windows_version])
 

diff --git a/src/bin/eet/Makefile.am b/src/bin/eet/Makefile.am
index 1972630262e9f50779c5a082dd7a20aa1f0e6b46..504f36cf5f7054418a564c3b42b87d2743b24826 100644 (file)
--- a/src/bin/eet/Makefile.am
+++ b/src/bin/eet/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EFL_CFLAGS@ \
 @EET_CFLAGS@
 
 if HAVE_WINDOWS

diff --git a/src/bin/evil/Makefile.am b/src/bin/evil/Makefile.am
index cf424f5a52123a322116c65da2d44cdf42f71307..dfc2f4b7cbdbb7eb0271003fff70597f4fe75fe0 100644 (file)
--- a/src/bin/evil/Makefile.am
+++ b/src/bin/evil/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/src/lib/evil \
 -I$(top_builddir)/src/lib/evil \
+@EFL_CFLAGS@ \
 @EVIL_CPPFLAGS@
 
 AM_CFLAGS = @EVIL_CFLAGS@

diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
index e0aad66fbdfac312976048297ac1608de5a00217..d0f4aab0887de5adfb231ebd6ed35d628494e0c2 100644 (file)
--- a/src/lib/eet/Makefile.am
+++ b/src/lib/eet/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DEFL_EET_BUILD \
+@EFL_CFLAGS@ \
 @EET_CFLAGS@
 
 if HAVE_WINDOWS

diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
index 298a371ed2e132405632238a15b7eec752b107fc..5f90d03b3b0a91801712e03ee576c61657e757b4 100644 (file)
--- a/src/lib/eina/Makefile.am
+++ b/src/lib/eina/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DEFL_EINA_BUILD \
+@EFL_CFLAGS@ \
 @EFL_PTHREAD_CFLAGS@ \
 @EINA_CFLAGS@ \
 @VALGRIND_CFLAGS@

diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
index 4138bca5e644b7eccbe4d23a231c78e6f2a46394..09083593ef6f4b2359f6cfdeb6740527a8fbba64 100644 (file)
--- a/src/lib/eo/Makefile.am
+++ b/src/lib/eo/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/eo \
 -DNDEBUG \
 -DEFL_EO_BUILD \
+@EFL_CFLAGS@ \
 @EO_CFLAGS@
 
 if HAVE_WINDOWS