Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
Makefile.am configure.in ecore-config.in ecore.spec.in
Log Message:
Freedesktop.org desktop, icon, and menu support as per the discussion in
the mailing list. It's not ready yet. It needs documentation, EFL
conformant naming, and a good whipping into shape by indent. The ecore
integration needs a reveiw, see if I got that right.
Consider this a preview, it's mostly there, just needs some tweking.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- Makefile.am 28 Jun 2006 07:20:16 -0000 1.25
+++ Makefile.am 11 Aug 2006 13:45:39 -0000 1.26
@@ -28,6 +28,7 @@
debian/libecore0-con.install \
debian/libecore0-config.install \
debian/libecore0-dbus.install \
+ debian/libecore0-desktop.install \
debian/libecore0-dev.install \
debian/libecore0-evas.install \
debian/libecore0-fb.install \
===================================================================
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- configure.in 7 Aug 2006 20:26:32 -0000 1.148
+++ configure.in 11 Aug 2006 13:45:39 -0000 1.149
@@ -921,7 +921,6 @@
AC_SUBST(ecore_ipc_cflags)
AC_SUBST(ecore_ipc_libs)
-
AC_MSG_CHECKING(whether ecore_dbus module is to be built)
want_ecore_dbus="yes";
have_ecore_dbus="no";
@@ -968,7 +967,6 @@
AC_SUBST(ecore_dbus_cflags)
AC_SUBST(ecore_dbus_libs)
-
AC_MSG_CHECKING(whether ecore_config module is to be built)
want_ecore_config="yes";
@@ -1155,6 +1153,45 @@
AC_SUBST(fam_libs)
AC_SUBST(ecore_file_libs)
+
+if test "x$have_ecore_file" = "xyes"; then
+ AC_MSG_CHECKING(whether ecore_desktop module is to be built)
+ want_ecore_desktop="yes";
+ have_ecore_desktop="no";
+ ecore_desktop_cflags="";
+ ecore_desktop_libs="";
+
+ AC_ARG_ENABLE(ecore-desktop,
+ [ --disable-ecore-desktop disable the ecore_desktop module],
+ [
+ if test x"$enableval" = x"yes" ; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ want_ecore_desktop="no"
+ fi
+ ], [
+ AC_MSG_RESULT(yes)
+ ]
+ )
+
+ if test "x$want_ecore_desktop" = "xyes"; then
+ AM_CONDITIONAL(BUILD_ECORE_DESKTOP, true)
+ AC_DEFINE(BUILD_ECORE_DESKTOP, 1, [Build Ecore_Desktop Module])
+ have_ecore_desktop="yes"
+ ecore_desktop_libs="-lecore_desktop";
+ else
+ AM_CONDITIONAL(BUILD_ECORE_DESKTOP, false)
+ fi
+
+ AC_SUBST(ecore_desktop_cflags)
+ AC_SUBST(ecore_desktop_libs)
+else
+ AC_MSG_RESULT(ecore_file not enabled so ecore_desktop will not be enabled)
+ want_ecore_desktop="no"
+fi
+
+
AC_ARG_ENABLE(pthreads,
[ --disable-pthreads disable building with pthread support],
[
@@ -1224,6 +1261,7 @@
src/lib/ecore_config/Makefile
src/lib/ecore_file/Makefile
src/lib/ecore_dbus/Makefile
+src/lib/ecore_desktop/Makefile
src/lib/ecore_directfb/Makefile
examples/Makefile
ecore-config
@@ -1254,6 +1292,7 @@
echo " Ecore_Ipc....................: $have_ecore_ipc (OpenSSL: $use_openssl)"
echo " Ecore_Config.................: $have_ecore_config"
echo " Ecore_DBUS...................: $have_ecore_dbus"
+echo " Ecore_Desktop................: $have_ecore_desktop"
#echo " Ecore_File...................: $have_ecore_file (Inotify:
$use_inotify) (FAM: $use_fam) (Poll: $use_poll)"
echo " Ecore_File...................: $have_ecore_file (Inotify:
$use_inotify) (Poll: $use_poll) (CURL: $use_curl)"
echo
===================================================================
RCS file: /cvs/e/e17/libs/ecore/ecore-config.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ecore-config.in 7 Aug 2006 20:26:32 -0000 1.16
+++ ecore-config.in 11 Aug 2006 13:45:39 -0000 1.17
@@ -6,8 +6,8 @@
usage() {
echo "Usage: ecore-config [--prefix[=DIR]] [--exec-prefix[=DIR]]
[--version] [--libs] [--cflags]" 1>&2
- echo " [--libs-con] [--libs-config] [--libs-dbus]
[--libs-evas] [--libs-fb]" 1>&2
- echo " [--libs-file] [--libs-ipc] [--libs-job]
[--libs-txt] [--libs-x]" 1>&2
+ echo " [--libs-con] [--libs-config] [--libs-dbus]
[--libs-desktop] [--libs-evas]" 1>&2
+ echo " [--libs-fb] [--libs-file] [--libs-ipc]
[--libs-job] [--libs-txt] [--libs-x]" 1>&2
}
if test $# -eq 0; then
@@ -49,7 +49,7 @@
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@
@ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@
@ecore_config_libs@ @ecore_file_libs@ @ecore_dbus_libs@ @SSL_LIBS@
@winsock_libs@ @CURL_LIBS@ @EET_LIBS@ @EVAS_LIBS@ @x_libs@ @Xcursor_libs@
@Xrender_libs@ @Xprint_libs@ @Xinerama_libs@ @Xrandr_libs@ @Xfixes_libs@
@Xdamage_libs@ @Xss_libs@ @iconv_libs@ @tslib_libs@ @fam_libs@ -lm
+ echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@
@ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@
@ecore_config_libs@ @ecore_file_libs@ @ecore_desktop_libs@ @ecore_dbus_libs@
@SSL_LIBS@ @winsock_libs@ @CURL_LIBS@ @EET_LIBS@ @EVAS_LIBS@ @x_libs@
@Xcursor_libs@ @Xrender_libs@ @Xprint_libs@ @Xinerama_libs@ @Xrandr_libs@
@Xfixes_libs@ @Xdamage_libs@ @Xss_libs@ @iconv_libs@ @tslib_libs@ @fam_libs@ -lm
;;
--libs-con)
[EMAIL PROTECTED]@
@@ -62,6 +62,10 @@
--libs-dbus)
[EMAIL PROTECTED]@
echo $libdirs -lecore @ecore_dbus_libs@ @SSL_LIBS@ -lm
+ ;;
+ --libs-desktop)
+ [EMAIL PROTECTED]@
+ echo $libdirs -lecore @ecore_desktop_libs@ @ecore_file_libs@ -lm
;;
--libs-evas)
[EMAIL PROTECTED]@
===================================================================
RCS file: /cvs/e/e17/libs/ecore/ecore.spec.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore.spec.in 25 May 2006 04:13:01 -0000 1.10
+++ ecore.spec.in 11 Aug 2006 13:45:39 -0000 1.11
@@ -27,7 +27,7 @@
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: openssl-devel, evas-devel, eet-devel
-Requires: ecore-con, ecore-config, ecore-dbus, ecore-evas, ecore-fb,
ecore-file, ecore-ipc, ecore-job, ecore-txt, ecore-x
+Requires: ecore-con, ecore-config, ecore-dbus, ecore-desktop, ecore-evas,
ecore-fb, ecore-file, ecore-ipc, ecore-job, ecore-txt, ecore-x
%description devel
Ecore development files
@@ -69,6 +69,11 @@
Group: Development/Libraries
Requires: %{name} = %{version}
+%package desktop
+Summary: Ecore freedesktop.org .desktop, icon, menu parsing Library
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
%description dbus
Ecore DBus Library
@@ -188,6 +193,10 @@
%files dbus
%defattr(-, root, root)
%{_libdir}/libecore_dbus.so.*
+
+%files desktop
+%defattr(-, root, root)
+%{_libdir}/libecore_desktop.so.*
%files evas
%defattr(-, root, root)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
