Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto/edvi
Dir : e17/proto/edvi
Modified Files:
ChangeLog Makefile.am configure.in
Removed Files:
edvi-config.in
Log Message:
* Makefile.am:
* configure.in:
* edvi-config.in:
* src/Makefile.am:
* src/bin/Makefile.am:
* src/lib/Makefile.am:
edvi-config removed, use of pkg-config to check the various efl
and other minor clean up.
* src/bin/edvi_esmart_test.c: (main), (app_resize):
* src/bin/edvi_etk_test.c: (main):
* src/bin/edvi_evas_test.c: (main):
* src/bin/edvi_ewl_test.c: (main):
minor clean up of the test programs
* src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render):
* src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor),
(_etk_dvi_load):
* src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set):
the initial value of the page is set to -1. Let the first page
to be drawn the first time the widget is showed.
* src/plugins/Makefile.am:
* src/plugins/epsilon/Makefile.am:
* src/plugins/epsilon/epsilon_thumbnailer.c:
(epsilon_thumb_imlib_standardize), (clip),
(epsilon_generate_thumb), (epsilon_plugin_init):
add epsilon thumbnailer
* src/plugins/ewl/Makefile.am:
* src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb),
(create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response),
(dvi_load):
move ewl test to its own dir
===================================================================
RCS file: /cvs/e/e17/proto/edvi/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ChangeLog 16 Jul 2006 20:51:17 -0000 1.1
+++ ChangeLog 30 Aug 2007 14:44:47 -0000 1.2
@@ -0,0 +1,37 @@
+2007-08-30 Vincent Torri <doursse at users dot sf dot net>
+
+ * Makefile.am:
+ * configure.in:
+ * edvi-config.in:
+ * src/Makefile.am:
+ * src/bin/Makefile.am:
+ * src/lib/Makefile.am:
+ edvi-config removed, use of pkg-config to check the various efl
+ and other minor clean up.
+
+ * src/bin/edvi_esmart_test.c: (main), (app_resize):
+ * src/bin/edvi_etk_test.c: (main):
+ * src/bin/edvi_evas_test.c: (main):
+ * src/bin/edvi_ewl_test.c: (main):
+ minor clean up of the test programs
+
+ * src/lib/esmart_dvi.c: (esmart_dvi_init), (_smart_page_render):
+ * src/lib/etk_dvi.c: (etk_dvi_file_set), (_etk_dvi_constructor),
+ (_etk_dvi_load):
+ * src/lib/ewl_dvi.c: (ewl_dvi_init), (ewl_dvi_file_set):
+ the initial value of the page is set to -1. Let the first page
+ to be drawn the first time the widget is showed.
+
+ * src/plugins/Makefile.am:
+ * src/plugins/epsilon/Makefile.am:
+ * src/plugins/epsilon/epsilon_thumbnailer.c:
+ (epsilon_thumb_imlib_standardize), (clip),
+ (epsilon_generate_thumb), (epsilon_plugin_init):
+ add epsilon thumbnailer
+
+ * src/plugins/ewl/Makefile.am:
+ * src/plugins/ewl/ewl_dvi.c: (test_info), (_change_page_cb),
+ (create_test), (create_dvi_fd_cb), (create_dvi_fd_window_response),
+ (dvi_load):
+ move ewl test to its own dir
+
===================================================================
RCS file: /cvs/e/e17/proto/edvi/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 16 Jul 2006 20:51:17 -0000 1.1
+++ Makefile.am 30 Aug 2007 14:44:47 -0000 1.2
@@ -7,9 +7,7 @@
depcomp install-sh ltconfig ltmain.sh missing \
stamp-h.in
-bin_SCRIPTS = edvi-config
-
-EXTRA_DIST = AUTHORS README edvi.pc.in edvi-config.in
+EXTRA_DIST = AUTHORS README edvi.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = edvi.pc
===================================================================
RCS file: /cvs/e/e17/proto/edvi/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- configure.in 22 Feb 2007 17:26:50 -0000 1.3
+++ configure.in 30 Aug 2007 14:44:47 -0000 1.4
@@ -1,11 +1,19 @@
AC_PREREQ(2.54)
-AC_INIT(edvi, 0.1.0, [EMAIL PROTECTED])
+AC_INIT(edvi, 0.1, [EMAIL PROTECTED])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+
+AM_INIT_AUTOMAKE(1.6)
+
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
AC_PROG_LIBTOOL
AC_PROG_CC
+AM_PROG_CC_C_O
+
+evas_version=0.9.9
+ecore_version=0.9.9
AC_PATH_GENERIC(DVIlib2, 2.9.0,
[ AC_DEFINE(HAVE_DVILIB_2_9, 1, [have dvilib 2.9.0]) ],
@@ -29,69 +37,53 @@
]
)
-AC_PATH_GENERIC(evas, 0.9.9,
- [ ],
- [
- echo "ERROR:"
- echo "The evas-config development script was not found in your execute"
- echo "path. This may mean one of several things"
- echo "1. You may not have installed the evas-devel (or evas-dev)"
- echo " packages."
- echo "2. You may have evas installed somewhere not covered by your path."
- echo ""
- echo "If this is the case make sure you have the packages installed, AND"
- echo "that the evas-config script is in your execute path (see your"
- echo "shell's manual page on setting the \$PATH environment variable), OR"
- echo "alternatively, specify the script to use with --with-evas-config."
- AC_MSG_ERROR([Fatal Error: no evas-config detected.])
- ]
-)
-
-AC_PATH_GENERIC(ecore, 0.9.9,
- [ ],
- [
- echo "ERROR:"
- echo "The ecore-config development script was not found in your execute"
- echo "path. This may mean one of several things"
- echo "1. You may not have installed the ecore-devel (or ecore-dev)"
- echo " packages."
- echo "2. You may have ecore installed somewhere not covered by your path."
- echo ""
- echo "If this is the case make sure you have the packages installed, AND"
- echo "that the ecore-config script is in your execute path (see your"
- echo "shell's manual page on setting the \$PATH environment variable), OR"
- echo "alternatively, specify the script to use with --with-ecore-config."
- AC_MSG_ERROR([Fatal Error: no ecore-config detected.])
- ]
-)
+PKG_CHECK_MODULES(EDVI, evas >= ${evas_version} ecore >= ${ecore_version})
+EDVI_CFLAGS="${EDVI_CFLAGS} ${DVILIB2_CFLAGS}"
+EDVI_LIBS="${EDVI_LIBS} ${DVILIB2_LIBS}"
requirements="evas ecore"
-AC_PATH_GENERIC(ewl, 0.0.4, [ have_ewl="yes" ], [ have_ewl="no" ])
-if test "x$have_ewl" = "xyes" ; then
+PKG_CHECK_MODULES(EWL,
+ ewl >= 0.5,
+ [
+ have_ewl="yes"
requirements="$requirements ewl"
- EWL_TEST_LIBS_DIR="`ewl-config --test-lib-dir`"
- EWL_TEST_SOURCE_DIR="`ewl-config --test-src-dir`"
+ EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
+ EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
AC_SUBST(EWL_TEST_LIBS_DIR)
AC_SUBST(EWL_TEST_SOURCE_DIR)
-else
- EWL_CFLAGS=""
- EWL_LIBS=""
- AC_SUBST(EWL_CFLAGS)
- AC_SUBST(EWL_LIBS)
-fi
-AM_CONDITIONAL(BUILD_EDVI_EWL, test x$have_ewl = xyes)
+ ],
+ [
+ have_ewl="no"
+ ]
+)
+AM_CONDITIONAL(BUILD_EDVI_EWL, test "x${have_ewl}" = "xyes")
-AC_PATH_GENERIC(etk, 0.1.0, [ have_etk="yes" ], [ have_etk="no" ])
-if test "x$have_etk" = "xyes" ; then
+PKG_CHECK_MODULES(ETK,
+ etk >= 0.1,
+ [
+ have_etk="yes"
requirements="$requirements etk"
-else
- ETK_CFLAGS=""
- ETK_LIBS=""
- AC_SUBST(ETK_CFLAGS)
- AC_SUBST(ETK_LIBS)
-fi
-AM_CONDITIONAL(BUILD_EDVI_ETK, test x$have_etk = xyes)
+ ],
+ [
+ have_etk="no"
+ ]
+)
+AM_CONDITIONAL(BUILD_EDVI_ETK, test "x${have_etk}" = "xyes")
+
+PKG_CHECK_MODULES(EPSILON,
+ imlib2 >= 1.4 epsilon >= 0.3,
+ [
+ have_epsilon="yes"
+ requirements="$requirements epsilon imlib2"
+ EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`"
+ AC_SUBST(EPSILON_PLUGINS_DIR)
+ ],
+ [
+ have_epsilon="no"
+ ]
+)
+AM_CONDITIONAL(BUILD_EDVI_EPSILON, test "x${have_epsilon}" = "xyes")
AC_SUBST(requirements)
@@ -101,9 +93,9 @@
src/Makefile
src/lib/Makefile
src/bin/Makefile
-edvi-config
-],[
-chmod +x edvi-config
+src/plugins/Makefile
+src/plugins/epsilon/Makefile
+src/plugins/ewl/Makefile
])
#####################################################################
@@ -120,13 +112,11 @@
echo
echo " Ewl widget...........: $have_ewl"
echo " Etk widget...........: $have_etk"
+echo " Epsilon plugin.......: ${have_epsilon}"
echo
echo " Compilation..........: make"
echo
echo " Installation.........: make install"
echo
echo " prefix.........: $prefix"
-echo " binaries.......: $bindir"
-echo " libraries......: $libdir"
-echo " headers........: $includedir"
echo
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
