summaryrefslogtreecommitdiff
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)
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 ea49b5406e..a99357b351 100644
--- a/configure.ac
+++ b/configure.ac
@@ -298,7 +298,18 @@ AC_CHECK_TYPES([struct dirent], [have_dirent="yes"], [have_dirent="no"],
298 298
299AC_C_BIGENDIAN 299AC_C_BIGENDIAN
300AC_C_INLINE 300AC_C_INLINE
301# EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra]) 301EFL_CHECK_COMPILER_FLAGS([EFL], [-Wall -Wextra -Wpointer-arith])
302case "${build_profile}" in
303 dev)
304 EFL_CHECK_COMPILER_FLAGS([EFL], [-Wshadow])
305 ;;
306
307 debug)
308 ;;
309
310 release)
311 ;;
312esac
302 313
303 314
304#### Checks for linker characteristics 315#### Checks for linker characteristics
@@ -402,7 +413,7 @@ AC_MSG_NOTICE([Eina checks])
402have_magic_debug="yes" 413have_magic_debug="yes"
403have_safety_checks="yes" 414have_safety_checks="yes"
404want_log="yes" 415want_log="yes"
405case "$build_profile" in 416case "${build_profile}" in
406 dev) 417 dev)
407 with_max_log_level="" 418 with_max_log_level=""
408 have_stringshare_usage="no" 419 have_stringshare_usage="no"
diff --git a/m4/evil_windows.m4 b/m4/evil_windows.m4
index be79b8296b..e64d68870d 100644
--- a/m4/evil_windows.m4
+++ b/m4/evil_windows.m4
@@ -52,7 +52,7 @@ case "${_winver}" in
52 ;; 52 ;;
53esac 53esac
54 54
55CPPFLAGS="${CPPFLAGS} ${EFL_WINDOWS_VERSION_CFLAGS}" 55EFL_CFLAGS="${EFL_CFLAGS} ${EFL_WINDOWS_VERSION_CFLAGS}"
56AC_SUBST([EFL_WINDOWS_VERSION_CFLAGS]) 56AC_SUBST([EFL_WINDOWS_VERSION_CFLAGS])
57AC_SUBST([_efl_windows_version]) 57AC_SUBST([_efl_windows_version])
58 58
diff --git a/src/bin/eet/Makefile.am b/src/bin/eet/Makefile.am
index 1972630262..504f36cf5f 100644
--- a/src/bin/eet/Makefile.am
+++ b/src/bin/eet/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
8-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 8-DPACKAGE_BIN_DIR=\"$(bindir)\" \
9-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 9-DPACKAGE_LIB_DIR=\"$(libdir)\" \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
11@EFL_CFLAGS@ \
11@EET_CFLAGS@ 12@EET_CFLAGS@
12 13
13if HAVE_WINDOWS 14if HAVE_WINDOWS
diff --git a/src/bin/evil/Makefile.am b/src/bin/evil/Makefile.am
index cf424f5a52..dfc2f4b7cb 100644
--- a/src/bin/evil/Makefile.am
+++ b/src/bin/evil/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
5-I. \ 5-I. \
6-I$(top_srcdir)/src/lib/evil \ 6-I$(top_srcdir)/src/lib/evil \
7-I$(top_builddir)/src/lib/evil \ 7-I$(top_builddir)/src/lib/evil \
8@EFL_CFLAGS@ \
8@EVIL_CPPFLAGS@ 9@EVIL_CPPFLAGS@
9 10
10AM_CFLAGS = @EVIL_CFLAGS@ 11AM_CFLAGS = @EVIL_CFLAGS@
diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
index e0aad66fbd..d0f4aab088 100644
--- a/src/lib/eet/Makefile.am
+++ b/src/lib/eet/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ 12-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
13-DEFL_EET_BUILD \ 13-DEFL_EET_BUILD \
14@EFL_CFLAGS@ \
14@EET_CFLAGS@ 15@EET_CFLAGS@
15 16
16if HAVE_WINDOWS 17if HAVE_WINDOWS
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
index 298a371ed2..5f90d03b3b 100644
--- a/src/lib/eina/Makefile.am
+++ b/src/lib/eina/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 7-DPACKAGE_LIB_DIR=\"$(libdir)\" \
8-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 8-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
9-DEFL_EINA_BUILD \ 9-DEFL_EINA_BUILD \
10@EFL_CFLAGS@ \
10@EFL_PTHREAD_CFLAGS@ \ 11@EFL_PTHREAD_CFLAGS@ \
11@EINA_CFLAGS@ \ 12@EINA_CFLAGS@ \
12@VALGRIND_CFLAGS@ 13@VALGRIND_CFLAGS@
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
index 4138bca5e6..09083593ef 100644
--- a/src/lib/eo/Makefile.am
+++ b/src/lib/eo/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_builddir)/src/lib/eo \ 7-I$(top_builddir)/src/lib/eo \
8-DNDEBUG \ 8-DNDEBUG \
9-DEFL_EO_BUILD \ 9-DEFL_EO_BUILD \
10@EFL_CFLAGS@ \
10@EO_CFLAGS@ 11@EO_CFLAGS@
11 12
12if HAVE_WINDOWS 13if HAVE_WINDOWS