efl/escape: simplify linkage/usage of escape on ps3.
SVN revision: 81478
This commit is contained in:
parent
b57e46b9b9
commit
ac598a94f8
|
@ -765,6 +765,9 @@ AC_SUBST([USE_EVIL_LIBS])
|
||||||
|
|
||||||
#### Escape
|
#### Escape
|
||||||
|
|
||||||
|
USE_ESCAPE_CFLAGS=""
|
||||||
|
USE_ESCAPE_LIBS=""
|
||||||
|
|
||||||
if test "x${have_ps3}" = "xyes" ; then
|
if test "x${have_ps3}" = "xyes" ; then
|
||||||
|
|
||||||
AC_MSG_NOTICE([Escape checks])
|
AC_MSG_NOTICE([Escape checks])
|
||||||
|
@ -796,8 +799,14 @@ AC_SUBST([ESCAPE_LIBS])
|
||||||
|
|
||||||
platform_pc_escape="escape >= ${PACKAGE_VERSION}"
|
platform_pc_escape="escape >= ${PACKAGE_VERSION}"
|
||||||
platform_pc="${platform_pc} ${platform_pc_escape}"
|
platform_pc="${platform_pc} ${platform_pc_escape}"
|
||||||
|
|
||||||
|
USE_ESCAPE_CFLAGS="-I\$(top_srcdir)/src/lib/escape"
|
||||||
|
USE_ESCAPE_LIBS="lib/escape/libescape.la"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_SUBST([USE_ESCAPE_CFLAGS])
|
||||||
|
AC_SUBST([USE_ESCAPE_LIBS])
|
||||||
|
|
||||||
#### End of Escape
|
#### End of Escape
|
||||||
|
|
||||||
AC_SUBST([DL_LIBS])
|
AC_SUBST([DL_LIBS])
|
||||||
|
|
|
@ -56,23 +56,17 @@ lib_ecore_libecore_la_CPPFLAGS = \
|
||||||
@EFL_CFLAGS@ \
|
@EFL_CFLAGS@ \
|
||||||
@EFL_COV_CFLAGS@ \
|
@EFL_COV_CFLAGS@ \
|
||||||
@ECORE_CFLAGS@ \
|
@ECORE_CFLAGS@ \
|
||||||
@USE_EVIL_CFLAGS@
|
@USE_EVIL_CFLAGS@ \
|
||||||
|
@USE_ESCAPE_CFLAGS@
|
||||||
if HAVE_PS3
|
|
||||||
lib_ecore_libecore_la_CPPFLAGS += \
|
|
||||||
-I$(top_srcdir)/src/lib/escape
|
|
||||||
endif
|
|
||||||
|
|
||||||
lib_ecore_libecore_la_LIBADD = \
|
lib_ecore_libecore_la_LIBADD = \
|
||||||
lib/eo/libeo.la \
|
lib/eo/libeo.la \
|
||||||
lib/eina/libeina.la \
|
lib/eina/libeina.la \
|
||||||
@USE_EVIL_LIBS@
|
@USE_EVIL_LIBS@ \
|
||||||
|
@USE_ESCAPE_LIBS@ \
|
||||||
if HAVE_PS3
|
@ECORE_LIBS@ \
|
||||||
lib_ecore_libecore_la_LIBADD += lib/escape/libescape.la
|
@EFL_COV_LIBS@ \
|
||||||
endif
|
-lm
|
||||||
|
|
||||||
lib_ecore_libecore_la_LIBADD += @ECORE_LIBS@ @EFL_COV_LIBS@ -lm
|
|
||||||
|
|
||||||
lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
|
lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue