summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-07-01 13:34:52 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-07-01 13:34:52 +0000
commitc3d63e1aad9e4b84258c319aeb2c37f70c5b9710 (patch)
tree072e06df5dcb255a6310848bafff106c7d152b3b /legacy
parentffc3e8ea825be729a1e5d0e25bd4c3d82b20dc17 (diff)
Eet: fix CFLAGS value when --enable-assert is used
SVN revision: 73113
Diffstat (limited to 'legacy')
-rw-r--r--legacy/eet/configure.ac3
-rw-r--r--legacy/eet/m4/efl_tests.m410
-rw-r--r--legacy/eet/src/lib/Makefile.am6
3 files changed, 7 insertions, 12 deletions
diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac
index da34453303..4f91427c66 100644
--- a/legacy/eet/configure.ac
+++ b/legacy/eet/configure.ac
@@ -487,9 +487,6 @@ EFL_CHECK_TESTS([eet], [enable_tests="yes"], [enable_tests="no"])
487AC_SUBST([requirements_pc_eet]) 487AC_SUBST([requirements_pc_eet])
488AC_SUBST([requirements_libs_eet]) 488AC_SUBST([requirements_libs_eet])
489 489
490DEBUG_CFLAGS=""
491AC_SUBST([DEBUG_CFLAGS])
492
493AC_OUTPUT([ 490AC_OUTPUT([
494Makefile 491Makefile
495eet.pc 492eet.pc
diff --git a/legacy/eet/m4/efl_tests.m4 b/legacy/eet/m4/efl_tests.m4
index edd57f2199..d8554e1539 100644
--- a/legacy/eet/m4/efl_tests.m4
+++ b/legacy/eet/m4/efl_tests.m4
@@ -44,17 +44,17 @@ if test "x${_efl_enable_tests}" = "xyes" ; then
44 m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -fprofile-arcs -ftest-coverage" 44 m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -fprofile-arcs -ftest-coverage"
45 m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -lgcov" 45 m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -lgcov"
46# remove any optimisation flag and force debug symbols 46# remove any optimisation flag and force debug symbols
47 m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG" 47 if test "x${prefer_assert}" = "xno"; then
48 m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -DNDEBUG"
49 else
50 m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG"
51 fi
48 efl_enable_coverage="yes" 52 efl_enable_coverage="yes"
49 else 53 else
50 AC_MSG_WARN([lcov is not found, disable profiling instrumentation]) 54 AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
51 fi 55 fi
52fi 56fi
53 57
54dnl Substitution
55AC_SUBST(EFL_COVERAGE_CFLAGS)
56AC_SUBST(EFL_COVERAGE_LIBS)
57
58AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes") 58AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes")
59 59
60AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3]) 60AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3])
diff --git a/legacy/eet/src/lib/Makefile.am b/legacy/eet/src/lib/Makefile.am
index 71a233f7ce..38096e7406 100644
--- a/legacy/eet/src/lib/Makefile.am
+++ b/legacy/eet/src/lib/Makefile.am
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
10-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 10-DPACKAGE_LIB_DIR=\"$(libdir)\" \
11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
12@EET_CFLAGS@ \ 12@EET_CFLAGS@ \
13@EFL_EET_BUILD@ \ 13@EFL_EET_BUILD@
14@EFL_COVERAGE_CFLAGS@
15 14
16includes_HEADERS = Eet.h 15includes_HEADERS = Eet.h
17includesdir = $(includedir)/eet-@VMAJ@ 16includesdir = $(includedir)/eet-@VMAJ@
@@ -34,8 +33,7 @@ lz4/lz4.h \
34lz4/lz4hc.c \ 33lz4/lz4hc.c \
35lz4/lz4hc.h 34lz4/lz4hc.h
36 35
37libeet_la_CFLAGS = @DEBUG_CFLAGS@ 36libeet_la_LIBADD = @EET_LIBS@ -lm
38libeet_la_LIBADD = @EFL_COVERAGE_LIBS@ @EET_LIBS@ -lm
39libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 37libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
40 38
41EXTRA_DIST = lz4/README 39EXTRA_DIST = lz4/README