Enlightenment CVS committal
Author : andrunko
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
Makefile.am configure.in ecore-imf.pc.in
Added Files:
ecore-imf-evas.pc.in
Log Message:
Added Ecore_IMF_Evas.
Removed Evas dependency from Ecore_IMF, that was requested by Ewl developers
in order to be able to integrate Ecore_IMF on it.
Added Ecore_IMF_Evas, a library with helper functions to use Ecore_IMF together
with Evas.
Now everybody should be happy.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- Makefile.am 19 Nov 2007 18:27:10 -0000 1.40
+++ Makefile.am 21 Nov 2007 22:20:15 -0000 1.41
@@ -17,6 +17,7 @@
ecore-fb.pc \
ecore-file.pc \
ecore-imf.pc \
+ ecore-imf-evas.pc \
ecore-ipc.pc \
ecore-job.pc \
ecore-txt.pc \
@@ -38,6 +39,7 @@
ecore-fb.pc.in \
ecore-file.pc.in \
ecore-imf.pc.in \
+ ecore-imf-evas.pc.in \
ecore-ipc.pc.in \
ecore-job.pc.in \
ecore-txt.pc.in \
@@ -79,6 +81,10 @@
pimf = ecore-imf.pc
endif
+if BUILD_ECORE_IMF_EVAS
+pimfevas = ecore-imf-evas.pc
+endif
+
if BUILD_ECORE_IPC
pipc = ecore-ipc.pc
endif
@@ -111,5 +117,5 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
ecore.pc $(pcon) $(pconfig) $(pdfb) $(pevas) \
- $(pfb) $(pfile) $(pdesktop) $(pimf) $(pipc) $(pjob) $(ptxt) \
+ $(pfb) $(pfile) $(pdesktop) $(pimf) $(pimfevas) $(pipc) $(pjob) $(ptxt)
\
$(px) $(pwin32) $(psdl)
===================================================================
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -3 -r1.242 -r1.243
--- configure.in 21 Nov 2007 12:16:16 -0000 1.242
+++ configure.in 21 Nov 2007 22:20:15 -0000 1.243
@@ -715,7 +715,14 @@
[requirements_ecore_desktop="ecore-file"])
dnl ecore_imf
-ECORE_CHECK_MODULE([IMF], [yes], [$have_evas])
+ECORE_CHECK_MODULE([IMF], [yes])
+
+try_ecore_imf_evas=no
+if test "x$have_ecore_imf" = xyes -a "x$have_evas" = "xyes"; then
+ try_ecore_imf_evas=yes
+fi
+
+ECORE_CHECK_MODULE([IMF_EVAS], [yes], [$try_ecore_imf_evas])
dnl requirements
AC_SUBST(requirements_ecore_con)
@@ -752,6 +759,7 @@
ecore-fb.pc
ecore-file.pc
ecore-imf.pc
+ecore-imf-evas.pc
ecore-ipc.pc
ecore-job.pc
ecore-txt.pc
@@ -770,6 +778,7 @@
src/lib/ecore_evas/Makefile
src/lib/ecore_con/Makefile
src/lib/ecore_imf/Makefile
+src/lib/ecore_imf_evas/Makefile
src/lib/ecore_ipc/Makefile
src/lib/ecore_txt/Makefile
src/lib/ecore_config/Makefile
@@ -816,6 +825,7 @@
echo " Ecore_Desktop................: $have_ecore_desktop"
echo " Ecore_IMF....................: $have_ecore_imf"
+echo " Ecore_IMF_Evas...............: $have_ecore_imf_evas"
echo
echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE."
echo
===================================================================
RCS file: /cvs/e/e17/libs/ecore/ecore-imf.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore-imf.pc.in 19 Nov 2007 18:27:11 -0000 1.1
+++ ecore-imf.pc.in 21 Nov 2007 22:20:15 -0000 1.2
@@ -5,7 +5,7 @@
Name: ecore-imf
Description: E core library, IMF module
-Requires: ecore evas
+Requires: ecore
Version: @VERSION@
Libs: -L${libdir} -lecore_imf
Cflags: -I${includedir}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
