aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-10-26 06:57:11 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-10-26 06:57:11 +0000
commit124e0d4afdff0937d8be8014f4dea5f78aa9f76f (patch)
treee62a139defd1608357e0cf4700b1dae285b31285
parentfd2a6181fa3e3d0ef935bdfca0dfc301be6de180 (diff)
downloadefl-124e0d4afdff0937d8be8014f4dea5f78aa9f76f.tar.gz
efl-124e0d4afdff0937d8be8014f4dea5f78aa9f76f.tar.xz
efl-124e0d4afdff0937d8be8014f4dea5f78aa9f76f.zip
merge: add a holdall variable
SVN revision: 78503
-rw-r--r--configure.ac15
-rw-r--r--m4/evil_windows.m42
-rw-r--r--src/bin/eet/Makefile.am1
-rw-r--r--src/bin/evil/Makefile.am1
-rw-r--r--src/lib/eet/Makefile.am1
-rw-r--r--src/lib/eina/Makefile.am1
-rw-r--r--src/lib/eo/Makefile.am1
7 files changed, 19 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index ea49b5406..a99357b35 100644
--- 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 be79b8296..e64d68870 100644
--- 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 197263026..504f36cf5 100644
--- 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 cf424f5a5..dfc2f4b7c 100644
--- 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 e0aad66fb..d0f4aab08 100644
--- 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 298a371ed..5f90d03b3 100644
--- 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 4138bca5e..09083593e 100644
--- 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