forked from enlightenment/efl
Eet: fix CFLAGS value when --enable-assert is used
SVN revision: 73113
This commit is contained in:
parent
ffc3e8ea82
commit
c3d63e1aad
|
@ -487,9 +487,6 @@ EFL_CHECK_TESTS([eet], [enable_tests="yes"], [enable_tests="no"])
|
||||||
AC_SUBST([requirements_pc_eet])
|
AC_SUBST([requirements_pc_eet])
|
||||||
AC_SUBST([requirements_libs_eet])
|
AC_SUBST([requirements_libs_eet])
|
||||||
|
|
||||||
DEBUG_CFLAGS=""
|
|
||||||
AC_SUBST([DEBUG_CFLAGS])
|
|
||||||
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
Makefile
|
Makefile
|
||||||
eet.pc
|
eet.pc
|
||||||
|
|
|
@ -44,17 +44,17 @@ if test "x${_efl_enable_tests}" = "xyes" ; then
|
||||||
m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -fprofile-arcs -ftest-coverage"
|
m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -fprofile-arcs -ftest-coverage"
|
||||||
m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -lgcov"
|
m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -lgcov"
|
||||||
# remove any optimisation flag and force debug symbols
|
# remove any optimisation flag and force debug symbols
|
||||||
m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG"
|
if test "x${prefer_assert}" = "xno"; then
|
||||||
|
m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -DNDEBUG"
|
||||||
|
else
|
||||||
|
m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG"
|
||||||
|
fi
|
||||||
efl_enable_coverage="yes"
|
efl_enable_coverage="yes"
|
||||||
else
|
else
|
||||||
AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
|
AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl Substitution
|
|
||||||
AC_SUBST(EFL_COVERAGE_CFLAGS)
|
|
||||||
AC_SUBST(EFL_COVERAGE_LIBS)
|
|
||||||
|
|
||||||
AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes")
|
AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes")
|
||||||
|
|
||||||
AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3])
|
AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3])
|
||||||
|
|
|
@ -10,8 +10,7 @@ AM_CPPFLAGS = \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||||
@EET_CFLAGS@ \
|
@EET_CFLAGS@ \
|
||||||
@EFL_EET_BUILD@ \
|
@EFL_EET_BUILD@
|
||||||
@EFL_COVERAGE_CFLAGS@
|
|
||||||
|
|
||||||
includes_HEADERS = Eet.h
|
includes_HEADERS = Eet.h
|
||||||
includesdir = $(includedir)/eet-@VMAJ@
|
includesdir = $(includedir)/eet-@VMAJ@
|
||||||
|
@ -34,8 +33,7 @@ lz4/lz4.h \
|
||||||
lz4/lz4hc.c \
|
lz4/lz4hc.c \
|
||||||
lz4/lz4hc.h
|
lz4/lz4hc.h
|
||||||
|
|
||||||
libeet_la_CFLAGS = @DEBUG_CFLAGS@
|
libeet_la_LIBADD = @EET_LIBS@ -lm
|
||||||
libeet_la_LIBADD = @EFL_COVERAGE_LIBS@ @EET_LIBS@ -lm
|
|
||||||
libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
|
libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
|
||||||
|
|
||||||
EXTRA_DIST = lz4/README
|
EXTRA_DIST = lz4/README
|
||||||
|
|
Loading…
Reference in New Issue