efl/escape: simplify linkage/usage of escape on ps3.

SVN revision: 81478

diff --git a/configure.ac b/configure.ac
index 914779ef55ab78c49c5fa060afd5b52e74043def..689118992670d8c9e03eef14104d7b305573ebbe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -765,6 +765,9 @@ AC_SUBST([USE_EVIL_LIBS])
 
 #### Escape
 
+USE_ESCAPE_CFLAGS=""
+USE_ESCAPE_LIBS=""
+
 if test "x${have_ps3}" = "xyes" ; then
 
 AC_MSG_NOTICE([Escape checks])
@@ -796,8 +799,14 @@ AC_SUBST([ESCAPE_LIBS])
 
 platform_pc_escape="escape >= ${PACKAGE_VERSION}"
 platform_pc="${platform_pc} ${platform_pc_escape}"
+
+USE_ESCAPE_CFLAGS="-I\$(top_srcdir)/src/lib/escape"
+USE_ESCAPE_LIBS="lib/escape/libescape.la"
 fi
 
+AC_SUBST([USE_ESCAPE_CFLAGS])
+AC_SUBST([USE_ESCAPE_LIBS])
+
 #### End of Escape
 
 AC_SUBST([DL_LIBS])

diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index cffe35faf13907fb293e045d8c868fc8dda68547..9fff02f21a6c0300cc876dd37ba45ab864ab8752 100644 (file)
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -56,23 +56,17 @@ lib_ecore_libecore_la_CPPFLAGS = \
 @EFL_CFLAGS@ \
 @EFL_COV_CFLAGS@ \
 @ECORE_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-if HAVE_PS3
-lib_ecore_libecore_la_CPPFLAGS += \
--I$(top_srcdir)/src/lib/escape
-endif
+@USE_EVIL_CFLAGS@ \
+@USE_ESCAPE_CFLAGS@
 
 lib_ecore_libecore_la_LIBADD = \
 lib/eo/libeo.la \
 lib/eina/libeina.la \
-@USE_EVIL_LIBS@
-
-if HAVE_PS3
-lib_ecore_libecore_la_LIBADD += lib/escape/libescape.la
-endif
-
-lib_ecore_libecore_la_LIBADD += @ECORE_LIBS@ @EFL_COV_LIBS@ -lm
+@USE_EVIL_LIBS@ \
+@USE_ESCAPE_LIBS@ \
+@ECORE_LIBS@ \
+@EFL_COV_LIBS@ \
+-lm
 
 lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@