ecore_x does not use ecore_txt functions anymore, so remove the

dependency on ecore_txt. I disable ecore_txt by default too

I can't test it (i'm on Windows). If you experience errors during
the build, please reply in this thread.

SVN revision: 46209
This commit is contained in:
Vincent Torri 2010-02-16 13:14:07 +00:00
parent 11ca6cc505
commit 5c2f696d25
4 changed files with 4 additions and 18 deletions

View File

@ -97,7 +97,7 @@ want_glib="no"
# core modules
want_ecore_data="yes"
want_ecore_txt="yes"
want_ecore_txt="no"
want_ecore_con="no"
want_ecore_ipc="no"
want_ecore_file="yes"
@ -323,7 +323,6 @@ case "$host_os" in
requirements_ecore_imf="evil ${requirements_ecore_imf}"
requirements_ecore_imf_evas="evil ${requirements_ecore_imf_evas}"
EFL_ECORE_BUILD="-DEFL_ECORE_BUILD"
EFL_ECORE_TXT_BUILD="-DEFL_ECORE_TXT_BUILD"
EFL_ECORE_FILE_BUILD="-DEFL_ECORE_FILE_BUILD"
EFL_ECORE_EVAS_BUILD="-DEFL_ECORE_EVAS_BUILD"
EFL_ECORE_IMF_BUILD="-DEFL_ECORE_IMF_BUILD"
@ -349,7 +348,6 @@ case "$host_os" in
esac
AC_SUBST(EFL_ECORE_BUILD)
AC_SUBST(EFL_ECORE_TXT_BUILD)
AC_SUBST(EFL_ECORE_FILE_BUILD)
AC_SUBST(EFL_ECORE_EVAS_BUILD)
AC_SUBST(EFL_ECORE_IMF_BUILD)
@ -1075,15 +1073,14 @@ ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_ev
ecore_x_deps="no"
if test "x${have_x}" = "xyes" -a \
"x${have_ecore_input}" = "xyes" -a \
"x${have_ecore_txt}" = "xyes" ; then
"x${have_ecore_input}" = "xyes" ; then
ecore_x_deps="yes"
fi
ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}],
[
ecore_x_libs="$ecore_x_libs $x_libs"
requirements_ecore_x="ecore-input ecore-txt ${requirements_ecore_x}"
requirements_ecore_x="ecore-input ${requirements_ecore_x}"
])
# ecore_win32

View File

@ -12,20 +12,15 @@ endif
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_txt \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_txt \
@EINA_CFLAGS@
lib_LTLIBRARIES = libecore_x.la
libecore_x_la_SOURCES =
libecore_x_la_LIBADD = $(DEP) \
@EINA_LIBS@
libecore_x_la_LIBADD = $(DEP) @EINA_LIBS@
libecore_x_la_LDFLAGS = -version-info @version_info@ @ecore_x_release_info@
libecore_x_la_DEPENDENCIES = $(DEP)
include_HEADERS = \

View File

@ -18,11 +18,9 @@ AM_CPPFLAGS = \
@XCB_XTEST_CFLAGS@ \
@XCB_CFLAGS@ \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_txt \
-I$(top_srcdir)/src/lib/ecore_x \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_txt \
-I$(top_builddir)/src/lib/ecore_x \
-I$(top_builddir)/src/lib/ecore_input \
@EVAS_CFLAGS@ \
@ -74,7 +72,6 @@ libecore_x_xcb_la_LIBADD = \
@XCB_XTEST_LIBS@ \
@XCB_LIBS@ \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
$(top_builddir)/src/lib/ecore_input/libecore_input.la \
@EINA_LIBS@

View File

@ -19,11 +19,9 @@ AM_CPPFLAGS = \
@XTEST_CFLAGS@ \
@x_cflags@ \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_txt \
-I$(top_srcdir)/src/lib/ecore_x \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_txt \
-I$(top_builddir)/src/lib/ecore_x \
-I$(top_builddir)/src/lib/ecore_input \
@EVAS_CFLAGS@ \
@ -78,7 +76,6 @@ libecore_x_xlib_la_LIBADD = \
@XTEST_LIBS@ \
@x_libs@ \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
$(top_builddir)/src/lib/ecore_input/libecore_input.la \
@EINA_LIBS@