aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/eet
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/eet')
-rw-r--r--libraries/eet/ChangeLog21
-rw-r--r--libraries/eet/Makefile.am8
-rw-r--r--libraries/eet/Makefile.in10
-rw-r--r--libraries/eet/NEWS12
-rw-r--r--libraries/eet/aclocal.m462
-rwxr-xr-xlibraries/eet/config.guess149
-rwxr-xr-xlibraries/eet/config.sub47
-rwxr-xr-xlibraries/eet/configure656
-rw-r--r--libraries/eet/configure.ac6
-rw-r--r--libraries/eet/doc/Doxyfile1689
-rw-r--r--libraries/eet/doc/Doxyfile.in1687
-rw-r--r--libraries/eet/doc/Makefile.am3
-rw-r--r--libraries/eet/doc/Makefile.in5
-rw-r--r--libraries/eet/eet.spec3
-rw-r--r--libraries/eet/eet.spec.in1
-rwxr-xr-xlibraries/eet/ltmain.sh4
-rw-r--r--libraries/eet/sha1-for-source.txt1
-rw-r--r--libraries/eet/src/Makefile.in2
-rw-r--r--libraries/eet/src/bin/Makefile.in2
-rw-r--r--libraries/eet/src/bin/eet_main.c88
-rw-r--r--libraries/eet/src/examples/Makefile.am4
-rw-r--r--libraries/eet/src/examples/Makefile.in64
-rw-r--r--libraries/eet/src/lib/Eet.h17
-rw-r--r--libraries/eet/src/lib/Eet_private.h135
-rw-r--r--libraries/eet/src/lib/Makefile.am1
-rw-r--r--libraries/eet/src/lib/Makefile.in27
-rw-r--r--libraries/eet/src/lib/eet_alloc.c93
-rw-r--r--libraries/eet/src/lib/eet_cipher.c26
-rw-r--r--libraries/eet/src/lib/eet_connection.c129
-rw-r--r--libraries/eet/src/lib/eet_data.c238
-rw-r--r--libraries/eet/src/lib/eet_dictionary.c55
-rw-r--r--libraries/eet/src/lib/eet_image.c74
-rw-r--r--libraries/eet/src/lib/eet_lib.c297
-rw-r--r--libraries/eet/src/lib/eet_node.c58
-rw-r--r--libraries/eet/src/lib/eet_utils.c2
-rw-r--r--libraries/eet/src/tests/Makefile.am1
-rw-r--r--libraries/eet/src/tests/Makefile.in3
-rw-r--r--libraries/eet/src/tests/eet_suite.c42
38 files changed, 4495 insertions, 1227 deletions
diff --git a/libraries/eet/ChangeLog b/libraries/eet/ChangeLog
index 0b3c5fb..795d102 100644
--- a/libraries/eet/ChangeLog
+++ b/libraries/eet/ChangeLog
@@ -107,7 +107,7 @@
107 107
1082008-09-25 Carsten Haitzler (The Rasterman) 1082008-09-25 Carsten Haitzler (The Rasterman)
109 109
110 1.1.0 release 110 1.5.0 release
111 111
1122008-10-20 Cedric BAIL 1122008-10-20 Cedric BAIL
113 113
@@ -546,3 +546,22 @@
546 * JPEG encode and decode in eet now uses ISLOW (not IFAST) due to 546 * JPEG encode and decode in eet now uses ISLOW (not IFAST) due to
547 noticable quality losses in the chase for speed. It will use 547 noticable quality losses in the chase for speed. It will use
548 IFAST for quality less than 60 when encoding 548 IFAST for quality less than 60 when encoding
549
5502011-12-02 Carsten Haitzler (The Rasterman)
551
552 1.1.0 release
553
5542011-12-02 Mike Blumenkrantz
555
556 * added eet_file_get to return the filename of an Eet_File
557 * Eet_File filenames are now stringshared
558 * added mempool allocators
559
5602011-12-29 Carsten Haitzler (The Rasterman)
561
562 * increase eet_connection packet size to 1Mb - more reasonable.
563
5642012-01-07 Boris Faure (billiob)
565
566 * make eet tool write to standard output if no output file given.
567
diff --git a/libraries/eet/Makefile.am b/libraries/eet/Makefile.am
index bc6e99a..34a5762 100644
--- a/libraries/eet/Makefile.am
+++ b/libraries/eet/Makefile.am
@@ -49,7 +49,7 @@ pkgconfig_DATA = eet.pc
49 49
50doc: 50doc:
51 @echo "entering doc/" 51 @echo "entering doc/"
52 make -C doc doc 52 $(MAKE) -C doc doc
53 53
54# Unit tests 54# Unit tests
55 55
@@ -83,9 +83,9 @@ lcov-report:
83 @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info 83 @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info
84 84
85coverage: 85coverage:
86 @make lcov-reset 86 @$(MAKE) lcov-reset
87 @make check 87 @$(MAKE) check
88 @make lcov-report 88 @$(MAKE) lcov-report
89 89
90clean-local: 90clean-local:
91 @rm -rf coverage 91 @rm -rf coverage
diff --git a/libraries/eet/Makefile.in b/libraries/eet/Makefile.in
index 4daff0f..b865027 100644
--- a/libraries/eet/Makefile.in
+++ b/libraries/eet/Makefile.in
@@ -223,8 +223,6 @@ PACKAGE_URL = @PACKAGE_URL@
223PACKAGE_VERSION = @PACKAGE_VERSION@ 223PACKAGE_VERSION = @PACKAGE_VERSION@
224PATH_SEPARATOR = @PATH_SEPARATOR@ 224PATH_SEPARATOR = @PATH_SEPARATOR@
225PKG_CONFIG = @PKG_CONFIG@ 225PKG_CONFIG = @PKG_CONFIG@
226PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
227PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
228RANLIB = @RANLIB@ 226RANLIB = @RANLIB@
229SED = @SED@ 227SED = @SED@
230SET_MAKE = @SET_MAKE@ 228SET_MAKE = @SET_MAKE@
@@ -867,7 +865,7 @@ uninstall-am: uninstall-pkgconfigDATA
867 865
868doc: 866doc:
869 @echo "entering doc/" 867 @echo "entering doc/"
870 make -C doc doc 868 $(MAKE) -C doc doc
871 869
872# Unit tests 870# Unit tests
873 871
@@ -894,9 +892,9 @@ doc:
894@EFL_ENABLE_COVERAGE_TRUE@ @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info 892@EFL_ENABLE_COVERAGE_TRUE@ @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info
895 893
896@EFL_ENABLE_COVERAGE_TRUE@coverage: 894@EFL_ENABLE_COVERAGE_TRUE@coverage:
897@EFL_ENABLE_COVERAGE_TRUE@ @make lcov-reset 895@EFL_ENABLE_COVERAGE_TRUE@ @$(MAKE) lcov-reset
898@EFL_ENABLE_COVERAGE_TRUE@ @make check 896@EFL_ENABLE_COVERAGE_TRUE@ @$(MAKE) check
899@EFL_ENABLE_COVERAGE_TRUE@ @make lcov-report 897@EFL_ENABLE_COVERAGE_TRUE@ @$(MAKE) lcov-report
900 898
901@EFL_ENABLE_COVERAGE_TRUE@clean-local: 899@EFL_ENABLE_COVERAGE_TRUE@clean-local:
902@EFL_ENABLE_COVERAGE_TRUE@ @rm -rf coverage 900@EFL_ENABLE_COVERAGE_TRUE@ @rm -rf coverage
diff --git a/libraries/eet/NEWS b/libraries/eet/NEWS
index 43118b0..cccda15 100644
--- a/libraries/eet/NEWS
+++ b/libraries/eet/NEWS
@@ -1,3 +1,15 @@
1Eet 1.6.0
2
3Changes since Eet 1.5.0:
4--------------------------
5
6Additions:
7 * eet_file_get to return filenames of Eet_Files
8
9Improvements:
10
11 * most allocations moved to mempools
12
1Eet 1.5.0 13Eet 1.5.0
2 14
3Changes since Eet 1.4.0: 15Changes since Eet 1.4.0:
diff --git a/libraries/eet/aclocal.m4 b/libraries/eet/aclocal.m4
index 1d329e5..6d7b012 100644
--- a/libraries/eet/aclocal.m4
+++ b/libraries/eet/aclocal.m4
@@ -13,14 +13,13 @@
13 13
14m4_ifndef([AC_AUTOCONF_VERSION], 14m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, 16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
17[m4_warning([this file was generated for autoconf 2.67. 17[m4_warning([this file was generated for autoconf 2.65.
18You have another version of autoconf. It may work, but is not guaranteed to. 18You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely. 19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])]) 20To do so, use the procedure documented by the package, typically `autoreconf'.])])
21 21
22# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 22# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
23# serial 1 (pkg-config-0.24)
24# 23#
25# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 24# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
26# 25#
@@ -48,10 +47,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
48AC_DEFUN([PKG_PROG_PKG_CONFIG], 47AC_DEFUN([PKG_PROG_PKG_CONFIG],
49[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 48[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
50m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) 49m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
51AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) 50AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
52AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
53AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
54
55if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 51if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
56 AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) 52 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
57fi 53fi
@@ -64,6 +60,7 @@ if test -n "$PKG_CONFIG"; then
64 AC_MSG_RESULT([no]) 60 AC_MSG_RESULT([no])
65 PKG_CONFIG="" 61 PKG_CONFIG=""
66 fi 62 fi
63
67fi[]dnl 64fi[]dnl
68])# PKG_PROG_PKG_CONFIG 65])# PKG_PROG_PKG_CONFIG
69 66
@@ -72,31 +69,34 @@ fi[]dnl
72# Check to see whether a particular set of modules exists. Similar 69# Check to see whether a particular set of modules exists. Similar
73# to PKG_CHECK_MODULES(), but does not set variables or print errors. 70# to PKG_CHECK_MODULES(), but does not set variables or print errors.
74# 71#
75# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 72#
76# only at the first occurence in configure.ac, so if the first place 73# Similar to PKG_CHECK_MODULES, make sure that the first instance of
77# it's called might be skipped (such as if it is within an "if", you 74# this or PKG_CHECK_MODULES is called, or make sure to call
78# have to call PKG_CHECK_EXISTS manually 75# PKG_CHECK_EXISTS manually
79# -------------------------------------------------------------- 76# --------------------------------------------------------------
80AC_DEFUN([PKG_CHECK_EXISTS], 77AC_DEFUN([PKG_CHECK_EXISTS],
81[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 78[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
82if test -n "$PKG_CONFIG" && \ 79if test -n "$PKG_CONFIG" && \
83 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then 80 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
84 m4_default([$2], [:]) 81 m4_ifval([$2], [$2], [:])
85m4_ifvaln([$3], [else 82m4_ifvaln([$3], [else
86 $3])dnl 83 $3])dnl
87fi]) 84fi])
88 85
86
89# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 87# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
90# --------------------------------------------- 88# ---------------------------------------------
91m4_define([_PKG_CONFIG], 89m4_define([_PKG_CONFIG],
92[if test -n "$$1"; then 90[if test -n "$PKG_CONFIG"; then
93 pkg_cv_[]$1="$$1" 91 if test -n "$$1"; then
94 elif test -n "$PKG_CONFIG"; then 92 pkg_cv_[]$1="$$1"
95 PKG_CHECK_EXISTS([$3], 93 else
96 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], 94 PKG_CHECK_EXISTS([$3],
97 [pkg_failed=yes]) 95 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
98 else 96 [pkg_failed=yes])
99 pkg_failed=untried 97 fi
98else
99 pkg_failed=untried
100fi[]dnl 100fi[]dnl
101])# _PKG_CONFIG 101])# _PKG_CONFIG
102 102
@@ -138,17 +138,16 @@ and $1[]_LIBS to avoid the need to call pkg-config.
138See the pkg-config man page for more details.]) 138See the pkg-config man page for more details.])
139 139
140if test $pkg_failed = yes; then 140if test $pkg_failed = yes; then
141 AC_MSG_RESULT([no])
142 _PKG_SHORT_ERRORS_SUPPORTED 141 _PKG_SHORT_ERRORS_SUPPORTED
143 if test $_pkg_short_errors_supported = yes; then 142 if test $_pkg_short_errors_supported = yes; then
144 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` 143 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
145 else 144 else
146 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` 145 $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
147 fi 146 fi
148 # Put the nasty error message in config.log where it belongs 147 # Put the nasty error message in config.log where it belongs
149 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD 148 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
150 149
151 m4_default([$4], [AC_MSG_ERROR( 150 ifelse([$4], , [AC_MSG_ERROR(dnl
152[Package requirements ($2) were not met: 151[Package requirements ($2) were not met:
153 152
154$$1_PKG_ERRORS 153$$1_PKG_ERRORS
@@ -156,24 +155,25 @@ $$1_PKG_ERRORS
156Consider adjusting the PKG_CONFIG_PATH environment variable if you 155Consider adjusting the PKG_CONFIG_PATH environment variable if you
157installed software in a non-standard prefix. 156installed software in a non-standard prefix.
158 157
159_PKG_TEXT])[]dnl 158_PKG_TEXT
160 ]) 159])],
160 [AC_MSG_RESULT([no])
161 $4])
161elif test $pkg_failed = untried; then 162elif test $pkg_failed = untried; then
162 AC_MSG_RESULT([no]) 163 ifelse([$4], , [AC_MSG_FAILURE(dnl
163 m4_default([$4], [AC_MSG_FAILURE(
164[The pkg-config script could not be found or is too old. Make sure it 164[The pkg-config script could not be found or is too old. Make sure it
165is in your PATH or set the PKG_CONFIG environment variable to the full 165is in your PATH or set the PKG_CONFIG environment variable to the full
166path to pkg-config. 166path to pkg-config.
167 167
168_PKG_TEXT 168_PKG_TEXT
169 169
170To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl 170To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
171 ]) 171 [$4])
172else 172else
173 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS 173 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
174 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS 174 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
175 AC_MSG_RESULT([yes]) 175 AC_MSG_RESULT([yes])
176 $3 176 ifelse([$3], , :, [$3])
177fi[]dnl 177fi[]dnl
178])# PKG_CHECK_MODULES 178])# PKG_CHECK_MODULES
179 179
diff --git a/libraries/eet/config.guess b/libraries/eet/config.guess
index c2246a4..e3a2116 100755
--- a/libraries/eet/config.guess
+++ b/libraries/eet/config.guess
@@ -1,10 +1,10 @@
1#! /bin/sh 1#! /bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6 6
7timestamp='2009-12-30' 7timestamp='2009-06-10'
8 8
9# This file is free software; you can redistribute it and/or modify it 9# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by 10# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-12-30'
27# the same distribution terms that you use for the rest of that program. 27# the same distribution terms that you use for the rest of that program.
28 28
29 29
30# Originally written by Per Bothner. Please send patches (context 30# Originally written by Per Bothner <per@bothner.com>.
31# diff format) to <config-patches@gnu.org> and include a ChangeLog 31# Please send patches to <config-patches@gnu.org>. Submit a context
32# entry. 32# diff and a properly formatted ChangeLog entry.
33# 33#
34# This script attempts to guess a canonical system name similar to 34# This script attempts to guess a canonical system name similar to
35# config.sub. If it succeeds, it prints the system name on stdout, and 35# config.sub. If it succeeds, it prints the system name on stdout, and
36# exits with 0. Otherwise, it exits with 1. 36# exits with 0. Otherwise, it exits with 1.
37# 37#
38# You can get the latest version of this script from: 38# The plan is that this can be called by configure scripts if you
39# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 39# don't specify an explicit build system type.
40 40
41me=`echo "$0" | sed -e 's,.*/,,'` 41me=`echo "$0" | sed -e 's,.*/,,'`
42 42
@@ -56,9 +56,8 @@ version="\
56GNU config.guess ($timestamp) 56GNU config.guess ($timestamp)
57 57
58Originally written by Per Bothner. 58Originally written by Per Bothner.
59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
602001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free 602002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
61Software Foundation, Inc.
62 61
63This is free software; see the source for copying conditions. There is NO 62This is free software; see the source for copying conditions. There is NO
64warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 63warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -334,9 +333,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
334 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 333 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
335 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 334 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
336 exit ;; 335 exit ;;
337 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
338 echo i386-pc-auroraux${UNAME_RELEASE}
339 exit ;;
340 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 336 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
341 eval $set_cc_for_build 337 eval $set_cc_for_build
342 SUN_ARCH="i386" 338 SUN_ARCH="i386"
@@ -811,12 +807,12 @@ EOF
811 i*:PW*:*) 807 i*:PW*:*)
812 echo ${UNAME_MACHINE}-pc-pw32 808 echo ${UNAME_MACHINE}-pc-pw32
813 exit ;; 809 exit ;;
814 *:Interix*:*) 810 *:Interix*:[3456]*)
815 case ${UNAME_MACHINE} in 811 case ${UNAME_MACHINE} in
816 x86) 812 x86)
817 echo i586-pc-interix${UNAME_RELEASE} 813 echo i586-pc-interix${UNAME_RELEASE}
818 exit ;; 814 exit ;;
819 authenticamd | genuineintel | EM64T) 815 EM64T | authenticamd | genuineintel)
820 echo x86_64-unknown-interix${UNAME_RELEASE} 816 echo x86_64-unknown-interix${UNAME_RELEASE}
821 exit ;; 817 exit ;;
822 IA64) 818 IA64)
@@ -858,20 +854,6 @@ EOF
858 i*86:Minix:*:*) 854 i*86:Minix:*:*)
859 echo ${UNAME_MACHINE}-pc-minix 855 echo ${UNAME_MACHINE}-pc-minix
860 exit ;; 856 exit ;;
861 alpha:Linux:*:*)
862 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
863 EV5) UNAME_MACHINE=alphaev5 ;;
864 EV56) UNAME_MACHINE=alphaev56 ;;
865 PCA56) UNAME_MACHINE=alphapca56 ;;
866 PCA57) UNAME_MACHINE=alphapca56 ;;
867 EV6) UNAME_MACHINE=alphaev6 ;;
868 EV67) UNAME_MACHINE=alphaev67 ;;
869 EV68*) UNAME_MACHINE=alphaev68 ;;
870 esac
871 objdump --private-headers /bin/sh | grep -q ld.so.1
872 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
873 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
874 exit ;;
875 arm*:Linux:*:*) 857 arm*:Linux:*:*)
876 eval $set_cc_for_build 858 eval $set_cc_for_build
877 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 859 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -894,17 +876,6 @@ EOF
894 frv:Linux:*:*) 876 frv:Linux:*:*)
895 echo frv-unknown-linux-gnu 877 echo frv-unknown-linux-gnu
896 exit ;; 878 exit ;;
897 i*86:Linux:*:*)
898 LIBC=gnu
899 eval $set_cc_for_build
900 sed 's/^ //' << EOF >$dummy.c
901 #ifdef __dietlibc__
902 LIBC=dietlibc
903 #endif
904EOF
905 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
906 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
907 exit ;;
908 ia64:Linux:*:*) 879 ia64:Linux:*:*)
909 echo ${UNAME_MACHINE}-unknown-linux-gnu 880 echo ${UNAME_MACHINE}-unknown-linux-gnu
910 exit ;; 881 exit ;;
@@ -930,18 +901,39 @@ EOF
930 #endif 901 #endif
931 #endif 902 #endif
932EOF 903EOF
933 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 904 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
905 /^CPU/{
906 s: ::g
907 p
908 }'`"
934 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 909 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
935 ;; 910 ;;
936 or32:Linux:*:*) 911 or32:Linux:*:*)
937 echo or32-unknown-linux-gnu 912 echo or32-unknown-linux-gnu
938 exit ;; 913 exit ;;
914 ppc:Linux:*:*)
915 echo powerpc-unknown-linux-gnu
916 exit ;;
917 ppc64:Linux:*:*)
918 echo powerpc64-unknown-linux-gnu
919 exit ;;
920 alpha:Linux:*:*)
921 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
922 EV5) UNAME_MACHINE=alphaev5 ;;
923 EV56) UNAME_MACHINE=alphaev56 ;;
924 PCA56) UNAME_MACHINE=alphapca56 ;;
925 PCA57) UNAME_MACHINE=alphapca56 ;;
926 EV6) UNAME_MACHINE=alphaev6 ;;
927 EV67) UNAME_MACHINE=alphaev67 ;;
928 EV68*) UNAME_MACHINE=alphaev68 ;;
929 esac
930 objdump --private-headers /bin/sh | grep -q ld.so.1
931 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
932 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
933 exit ;;
939 padre:Linux:*:*) 934 padre:Linux:*:*)
940 echo sparc-unknown-linux-gnu 935 echo sparc-unknown-linux-gnu
941 exit ;; 936 exit ;;
942 parisc64:Linux:*:* | hppa64:Linux:*:*)
943 echo hppa64-unknown-linux-gnu
944 exit ;;
945 parisc:Linux:*:* | hppa:Linux:*:*) 937 parisc:Linux:*:* | hppa:Linux:*:*)
946 # Look for CPU level 938 # Look for CPU level
947 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 939 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -950,11 +942,8 @@ EOF
950 *) echo hppa-unknown-linux-gnu ;; 942 *) echo hppa-unknown-linux-gnu ;;
951 esac 943 esac
952 exit ;; 944 exit ;;
953 ppc64:Linux:*:*) 945 parisc64:Linux:*:* | hppa64:Linux:*:*)
954 echo powerpc64-unknown-linux-gnu 946 echo hppa64-unknown-linux-gnu
955 exit ;;
956 ppc:Linux:*:*)
957 echo powerpc-unknown-linux-gnu
958 exit ;; 947 exit ;;
959 s390:Linux:*:* | s390x:Linux:*:*) 948 s390:Linux:*:* | s390x:Linux:*:*)
960 echo ${UNAME_MACHINE}-ibm-linux 949 echo ${UNAME_MACHINE}-ibm-linux
@@ -977,6 +966,58 @@ EOF
977 xtensa*:Linux:*:*) 966 xtensa*:Linux:*:*)
978 echo ${UNAME_MACHINE}-unknown-linux-gnu 967 echo ${UNAME_MACHINE}-unknown-linux-gnu
979 exit ;; 968 exit ;;
969 i*86:Linux:*:*)
970 # The BFD linker knows what the default object file format is, so
971 # first see if it will tell us. cd to the root directory to prevent
972 # problems with other programs or directories called `ld' in the path.
973 # Set LC_ALL=C to ensure ld outputs messages in English.
974 ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
975 | sed -ne '/supported targets:/!d
976 s/[ ][ ]*/ /g
977 s/.*supported targets: *//
978 s/ .*//
979 p'`
980 case "$ld_supported_targets" in
981 elf32-i386)
982 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
983 ;;
984 esac
985 # Determine whether the default compiler is a.out or elf
986 eval $set_cc_for_build
987 sed 's/^ //' << EOF >$dummy.c
988 #include <features.h>
989 #ifdef __ELF__
990 # ifdef __GLIBC__
991 # if __GLIBC__ >= 2
992 LIBC=gnu
993 # else
994 LIBC=gnulibc1
995 # endif
996 # else
997 LIBC=gnulibc1
998 # endif
999 #else
1000 #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1001 LIBC=gnu
1002 #else
1003 LIBC=gnuaout
1004 #endif
1005 #endif
1006 #ifdef __dietlibc__
1007 LIBC=dietlibc
1008 #endif
1009EOF
1010 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1011 /^LIBC/{
1012 s: ::g
1013 p
1014 }'`"
1015 test x"${LIBC}" != x && {
1016 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1017 exit
1018 }
1019 test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1020 ;;
980 i*86:DYNIX/ptx:4*:*) 1021 i*86:DYNIX/ptx:4*:*)
981 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 1022 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
982 # earlier versions are messed up and put the nodename in both 1023 # earlier versions are messed up and put the nodename in both
@@ -1206,16 +1247,6 @@ EOF
1206 *:Darwin:*:*) 1247 *:Darwin:*:*)
1207 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1248 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1208 case $UNAME_PROCESSOR in 1249 case $UNAME_PROCESSOR in
1209 i386)
1210 eval $set_cc_for_build
1211 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1212 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1213 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1214 grep IS_64BIT_ARCH >/dev/null
1215 then
1216 UNAME_PROCESSOR="x86_64"
1217 fi
1218 fi ;;
1219 unknown) UNAME_PROCESSOR=powerpc ;; 1250 unknown) UNAME_PROCESSOR=powerpc ;;
1220 esac 1251 esac
1221 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1252 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/libraries/eet/config.sub b/libraries/eet/config.sub
index c2d1257..eb0389a 100755
--- a/libraries/eet/config.sub
+++ b/libraries/eet/config.sub
@@ -1,10 +1,10 @@
1#! /bin/sh 1#! /bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6 6
7timestamp='2010-01-22' 7timestamp='2009-06-11'
8 8
9# This file is (in principle) common to ALL GNU software. 9# This file is (in principle) common to ALL GNU software.
10# The presence of a machine in this file suggests that SOME GNU software 10# The presence of a machine in this file suggests that SOME GNU software
@@ -32,16 +32,13 @@ timestamp='2010-01-22'
32 32
33 33
34# Please send patches to <config-patches@gnu.org>. Submit a context 34# Please send patches to <config-patches@gnu.org>. Submit a context
35# diff and a properly formatted GNU ChangeLog entry. 35# diff and a properly formatted ChangeLog entry.
36# 36#
37# Configuration subroutine to validate and canonicalize a configuration type. 37# Configuration subroutine to validate and canonicalize a configuration type.
38# Supply the specified configuration type as an argument. 38# Supply the specified configuration type as an argument.
39# If it is invalid, we print an error message on stderr and exit with code 1. 39# If it is invalid, we print an error message on stderr and exit with code 1.
40# Otherwise, we print the canonical config type on stdout and succeed. 40# Otherwise, we print the canonical config type on stdout and succeed.
41 41
42# You can get the latest version of this script from:
43# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
44
45# This file is supposed to be the same for all GNU packages 42# This file is supposed to be the same for all GNU packages
46# and recognize all the CPU types, system types and aliases 43# and recognize all the CPU types, system types and aliases
47# that are meaningful with *any* GNU software. 44# that are meaningful with *any* GNU software.
@@ -75,9 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
75version="\ 72version="\
76GNU config.sub ($timestamp) 73GNU config.sub ($timestamp)
77 74
78Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 75Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
792001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free 762002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
80Software Foundation, Inc.
81 77
82This is free software; see the source for copying conditions. There is NO 78This is free software; see the source for copying conditions. There is NO
83warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 79warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -153,7 +149,7 @@ case $os in
153 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ 149 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
154 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ 150 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
155 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ 151 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
156 -apple | -axis | -knuth | -cray | -microblaze) 152 -apple | -axis | -knuth | -cray)
157 os= 153 os=
158 basic_machine=$1 154 basic_machine=$1
159 ;; 155 ;;
@@ -288,7 +284,6 @@ case $basic_machine in
288 | pdp10 | pdp11 | pj | pjl \ 284 | pdp10 | pdp11 | pj | pjl \
289 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ 285 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
290 | pyramid \ 286 | pyramid \
291 | rx \
292 | score \ 287 | score \
293 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 288 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
294 | sh64 | sh64le \ 289 | sh64 | sh64le \
@@ -296,14 +291,13 @@ case $basic_machine in
296 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ 291 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
297 | spu | strongarm \ 292 | spu | strongarm \
298 | tahoe | thumb | tic4x | tic80 | tron \ 293 | tahoe | thumb | tic4x | tic80 | tron \
299 | ubicom32 \
300 | v850 | v850e \ 294 | v850 | v850e \
301 | we32k \ 295 | we32k \
302 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ 296 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
303 | z8k | z80) 297 | z8k | z80)
304 basic_machine=$basic_machine-unknown 298 basic_machine=$basic_machine-unknown
305 ;; 299 ;;
306 m6811 | m68hc11 | m6812 | m68hc12 | picochip) 300 m6811 | m68hc11 | m6812 | m68hc12)
307 # Motorola 68HC11/12. 301 # Motorola 68HC11/12.
308 basic_machine=$basic_machine-unknown 302 basic_machine=$basic_machine-unknown
309 os=-none 303 os=-none
@@ -346,7 +340,7 @@ case $basic_machine in
346 | lm32-* \ 340 | lm32-* \
347 | m32c-* | m32r-* | m32rle-* \ 341 | m32c-* | m32r-* | m32rle-* \
348 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 342 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
349 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ 343 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
350 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 344 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
351 | mips16-* \ 345 | mips16-* \
352 | mips64-* | mips64el-* \ 346 | mips64-* | mips64el-* \
@@ -374,17 +368,15 @@ case $basic_machine in
374 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 368 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
375 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ 369 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
376 | pyramid-* \ 370 | pyramid-* \
377 | romp-* | rs6000-* | rx-* \ 371 | romp-* | rs6000-* \
378 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 372 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
379 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 373 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
380 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 374 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
381 | sparclite-* \ 375 | sparclite-* \
382 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ 376 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
383 | tahoe-* | thumb-* \ 377 | tahoe-* | thumb-* \
384 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 378 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
385 | tile-* | tilegx-* \
386 | tron-* \ 379 | tron-* \
387 | ubicom32-* \
388 | v850-* | v850e-* | vax-* \ 380 | v850-* | v850e-* | vax-* \
389 | we32k-* \ 381 | we32k-* \
390 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ 382 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -734,9 +726,6 @@ case $basic_machine in
734 basic_machine=ns32k-utek 726 basic_machine=ns32k-utek
735 os=-sysv 727 os=-sysv
736 ;; 728 ;;
737 microblaze)
738 basic_machine=microblaze-xilinx
739 ;;
740 mingw32) 729 mingw32)
741 basic_machine=i386-pc 730 basic_machine=i386-pc
742 os=-mingw32 731 os=-mingw32
@@ -1087,11 +1076,6 @@ case $basic_machine in
1087 basic_machine=tic6x-unknown 1076 basic_machine=tic6x-unknown
1088 os=-coff 1077 os=-coff
1089 ;; 1078 ;;
1090 # This must be matched before tile*.
1091 tilegx*)
1092 basic_machine=tilegx-unknown
1093 os=-linux-gnu
1094 ;;
1095 tile*) 1079 tile*)
1096 basic_machine=tile-unknown 1080 basic_machine=tile-unknown
1097 os=-linux-gnu 1081 os=-linux-gnu
@@ -1263,9 +1247,6 @@ case $os in
1263 # First match some system type aliases 1247 # First match some system type aliases
1264 # that might get confused with valid system types. 1248 # that might get confused with valid system types.
1265 # -solaris* is a basic system type, with this one exception. 1249 # -solaris* is a basic system type, with this one exception.
1266 -auroraux)
1267 os=-auroraux
1268 ;;
1269 -solaris1 | -solaris1.*) 1250 -solaris1 | -solaris1.*)
1270 os=`echo $os | sed -e 's|solaris1|sunos4|'` 1251 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1271 ;; 1252 ;;
@@ -1287,8 +1268,8 @@ case $os in
1287 # -sysv* is not here because it comes later, after sysvr4. 1268 # -sysv* is not here because it comes later, after sysvr4.
1288 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 1269 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1289 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ 1270 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1290 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ 1271 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1291 | -sym* | -kopensolaris* \ 1272 | -kopensolaris* \
1292 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 1273 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1293 | -aos* | -aros* \ 1274 | -aos* | -aros* \
1294 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1275 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1309,7 +1290,7 @@ case $os in
1309 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1290 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1310 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1291 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1311 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 1292 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1312 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) 1293 | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1313 # Remember, each alternative MUST END IN *, to match a version number. 1294 # Remember, each alternative MUST END IN *, to match a version number.
1314 ;; 1295 ;;
1315 -qnx*) 1296 -qnx*)
@@ -1442,8 +1423,6 @@ case $os in
1442 -dicos*) 1423 -dicos*)
1443 os=-dicos 1424 os=-dicos
1444 ;; 1425 ;;
1445 -nacl*)
1446 ;;
1447 -none) 1426 -none)
1448 ;; 1427 ;;
1449 *) 1428 *)
diff --git a/libraries/eet/configure b/libraries/eet/configure
index a3dddde..b02c1c4 100755
--- a/libraries/eet/configure
+++ b/libraries/eet/configure
@@ -1,13 +1,13 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for eet 1.5.0. 3# Generated by GNU Autoconf 2.65 for eet 1.5.99.67344.
4# 4#
5# Report bugs to <enlightenment-devel@lists.sourceforge.net>. 5# Report bugs to <enlightenment-devel@lists.sourceforge.net>.
6# 6#
7# 7#
8# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 8# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10# Foundation, Inc. 10# Inc.
11# 11#
12# 12#
13# This configure script is free software; the Free Software Foundation 13# This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
319 test -d "$as_dir" && break 319 test -d "$as_dir" && break
320 done 320 done
321 test -z "$as_dirs" || eval "mkdir $as_dirs" 321 test -z "$as_dirs" || eval "mkdir $as_dirs"
322 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 322 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
323 323
324 324
325} # as_fn_mkdir_p 325} # as_fn_mkdir_p
@@ -359,19 +359,19 @@ else
359fi # as_fn_arith 359fi # as_fn_arith
360 360
361 361
362# as_fn_error STATUS ERROR [LINENO LOG_FD] 362# as_fn_error ERROR [LINENO LOG_FD]
363# ---------------------------------------- 363# ---------------------------------
364# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 364# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
365# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 365# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
366# script with STATUS, using 1 if that was 0. 366# script with status $?, using 1 if that was 0.
367as_fn_error () 367as_fn_error ()
368{ 368{
369 as_status=$1; test $as_status -eq 0 && as_status=1 369 as_status=$?; test $as_status -eq 0 && as_status=1
370 if test "$4"; then 370 if test "$3"; then
371 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 371 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
372 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 372 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
373 fi 373 fi
374 $as_echo "$as_me: error: $2" >&2 374 $as_echo "$as_me: error: $1" >&2
375 as_fn_exit $as_status 375 as_fn_exit $as_status
376} # as_fn_error 376} # as_fn_error
377 377
@@ -682,7 +682,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
682exec 6>&1 682exec 6>&1
683 683
684# Name of the host. 684# Name of the host.
685# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, 685# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
686# so uname gets run too. 686# so uname gets run too.
687ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 687ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
688 688
@@ -701,8 +701,8 @@ MAKEFLAGS=
701# Identity of this package. 701# Identity of this package.
702PACKAGE_NAME='eet' 702PACKAGE_NAME='eet'
703PACKAGE_TARNAME='eet' 703PACKAGE_TARNAME='eet'
704PACKAGE_VERSION='1.5.0' 704PACKAGE_VERSION='1.5.99.67344'
705PACKAGE_STRING='eet 1.5.0' 705PACKAGE_STRING='eet 1.5.99.67344'
706PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' 706PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
707PACKAGE_URL='' 707PACKAGE_URL=''
708 708
@@ -781,8 +781,6 @@ EFL_ENABLE_TESTS_FALSE
781EFL_ENABLE_TESTS_TRUE 781EFL_ENABLE_TESTS_TRUE
782CHECK_LIBS 782CHECK_LIBS
783CHECK_CFLAGS 783CHECK_CFLAGS
784PKG_CONFIG_LIBDIR
785PKG_CONFIG_PATH
786PKG_CONFIG 784PKG_CONFIG
787BUILD_EXAMPLES_FALSE 785BUILD_EXAMPLES_FALSE
788BUILD_EXAMPLES_TRUE 786BUILD_EXAMPLES_TRUE
@@ -944,8 +942,6 @@ LIBS
944CPPFLAGS 942CPPFLAGS
945CPP 943CPP
946PKG_CONFIG 944PKG_CONFIG
947PKG_CONFIG_PATH
948PKG_CONFIG_LIBDIR
949CHECK_CFLAGS 945CHECK_CFLAGS
950CHECK_LIBS 946CHECK_LIBS
951EVIL_CFLAGS 947EVIL_CFLAGS
@@ -1018,9 +1014,8 @@ do
1018 fi 1014 fi
1019 1015
1020 case $ac_option in 1016 case $ac_option in
1021 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 1017 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1022 *=) ac_optarg= ;; 1018 *) ac_optarg=yes ;;
1023 *) ac_optarg=yes ;;
1024 esac 1019 esac
1025 1020
1026 # Accept the important Cygnus configure options, so we can diagnose typos. 1021 # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1065,7 +1060,7 @@ do
1065 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 1060 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1066 # Reject names that are not valid shell variable names. 1061 # Reject names that are not valid shell variable names.
1067 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1062 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1068 as_fn_error $? "invalid feature name: $ac_useropt" 1063 as_fn_error "invalid feature name: $ac_useropt"
1069 ac_useropt_orig=$ac_useropt 1064 ac_useropt_orig=$ac_useropt
1070 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1065 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1071 case $ac_user_opts in 1066 case $ac_user_opts in
@@ -1091,7 +1086,7 @@ do
1091 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 1086 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1092 # Reject names that are not valid shell variable names. 1087 # Reject names that are not valid shell variable names.
1093 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1088 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1094 as_fn_error $? "invalid feature name: $ac_useropt" 1089 as_fn_error "invalid feature name: $ac_useropt"
1095 ac_useropt_orig=$ac_useropt 1090 ac_useropt_orig=$ac_useropt
1096 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1091 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1097 case $ac_user_opts in 1092 case $ac_user_opts in
@@ -1295,7 +1290,7 @@ do
1295 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 1290 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1296 # Reject names that are not valid shell variable names. 1291 # Reject names that are not valid shell variable names.
1297 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1292 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1298 as_fn_error $? "invalid package name: $ac_useropt" 1293 as_fn_error "invalid package name: $ac_useropt"
1299 ac_useropt_orig=$ac_useropt 1294 ac_useropt_orig=$ac_useropt
1300 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1295 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1301 case $ac_user_opts in 1296 case $ac_user_opts in
@@ -1311,7 +1306,7 @@ do
1311 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 1306 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1312 # Reject names that are not valid shell variable names. 1307 # Reject names that are not valid shell variable names.
1313 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1308 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1314 as_fn_error $? "invalid package name: $ac_useropt" 1309 as_fn_error "invalid package name: $ac_useropt"
1315 ac_useropt_orig=$ac_useropt 1310 ac_useropt_orig=$ac_useropt
1316 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1311 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1317 case $ac_user_opts in 1312 case $ac_user_opts in
@@ -1341,8 +1336,8 @@ do
1341 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 1336 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1342 x_libraries=$ac_optarg ;; 1337 x_libraries=$ac_optarg ;;
1343 1338
1344 -*) as_fn_error $? "unrecognized option: \`$ac_option' 1339 -*) as_fn_error "unrecognized option: \`$ac_option'
1345Try \`$0 --help' for more information" 1340Try \`$0 --help' for more information."
1346 ;; 1341 ;;
1347 1342
1348 *=*) 1343 *=*)
@@ -1350,7 +1345,7 @@ Try \`$0 --help' for more information"
1350 # Reject names that are not valid shell variable names. 1345 # Reject names that are not valid shell variable names.
1351 case $ac_envvar in #( 1346 case $ac_envvar in #(
1352 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1347 '' | [0-9]* | *[!_$as_cr_alnum]* )
1353 as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; 1348 as_fn_error "invalid variable name: \`$ac_envvar'" ;;
1354 esac 1349 esac
1355 eval $ac_envvar=\$ac_optarg 1350 eval $ac_envvar=\$ac_optarg
1356 export $ac_envvar ;; 1351 export $ac_envvar ;;
@@ -1368,13 +1363,13 @@ done
1368 1363
1369if test -n "$ac_prev"; then 1364if test -n "$ac_prev"; then
1370 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1365 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1371 as_fn_error $? "missing argument to $ac_option" 1366 as_fn_error "missing argument to $ac_option"
1372fi 1367fi
1373 1368
1374if test -n "$ac_unrecognized_opts"; then 1369if test -n "$ac_unrecognized_opts"; then
1375 case $enable_option_checking in 1370 case $enable_option_checking in
1376 no) ;; 1371 no) ;;
1377 fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; 1372 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
1378 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1373 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1379 esac 1374 esac
1380fi 1375fi
@@ -1397,7 +1392,7 @@ do
1397 [\\/$]* | ?:[\\/]* ) continue;; 1392 [\\/$]* | ?:[\\/]* ) continue;;
1398 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1393 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1399 esac 1394 esac
1400 as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" 1395 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
1401done 1396done
1402 1397
1403# There might be people who depend on the old broken behavior: `$host' 1398# There might be people who depend on the old broken behavior: `$host'
@@ -1411,8 +1406,8 @@ target=$target_alias
1411if test "x$host_alias" != x; then 1406if test "x$host_alias" != x; then
1412 if test "x$build_alias" = x; then 1407 if test "x$build_alias" = x; then
1413 cross_compiling=maybe 1408 cross_compiling=maybe
1414 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 1409 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1415 If a cross compiler is detected then cross compile mode will be used" >&2 1410 If a cross compiler is detected then cross compile mode will be used." >&2
1416 elif test "x$build_alias" != "x$host_alias"; then 1411 elif test "x$build_alias" != "x$host_alias"; then
1417 cross_compiling=yes 1412 cross_compiling=yes
1418 fi 1413 fi
@@ -1427,9 +1422,9 @@ test "$silent" = yes && exec 6>/dev/null
1427ac_pwd=`pwd` && test -n "$ac_pwd" && 1422ac_pwd=`pwd` && test -n "$ac_pwd" &&
1428ac_ls_di=`ls -di .` && 1423ac_ls_di=`ls -di .` &&
1429ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1424ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1430 as_fn_error $? "working directory cannot be determined" 1425 as_fn_error "working directory cannot be determined"
1431test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1426test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1432 as_fn_error $? "pwd does not report name of working directory" 1427 as_fn_error "pwd does not report name of working directory"
1433 1428
1434 1429
1435# Find the source files, if location was not specified. 1430# Find the source files, if location was not specified.
@@ -1468,11 +1463,11 @@ else
1468fi 1463fi
1469if test ! -r "$srcdir/$ac_unique_file"; then 1464if test ! -r "$srcdir/$ac_unique_file"; then
1470 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1465 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1471 as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" 1466 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
1472fi 1467fi
1473ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1468ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1474ac_abs_confdir=`( 1469ac_abs_confdir=`(
1475 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" 1470 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
1476 pwd)` 1471 pwd)`
1477# When building in place, set srcdir=. 1472# When building in place, set srcdir=.
1478if test "$ac_abs_confdir" = "$ac_pwd"; then 1473if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1498,7 +1493,7 @@ if test "$ac_init_help" = "long"; then
1498 # Omit some internal or obsolete options to make the list less imposing. 1493 # Omit some internal or obsolete options to make the list less imposing.
1499 # This message is too long to be a string in the A/UX 3.1 sh. 1494 # This message is too long to be a string in the A/UX 3.1 sh.
1500 cat <<_ACEOF 1495 cat <<_ACEOF
1501\`configure' configures eet 1.5.0 to adapt to many kinds of systems. 1496\`configure' configures eet 1.5.99.67344 to adapt to many kinds of systems.
1502 1497
1503Usage: $0 [OPTION]... [VAR=VALUE]... 1498Usage: $0 [OPTION]... [VAR=VALUE]...
1504 1499
@@ -1512,7 +1507,7 @@ Configuration:
1512 --help=short display options specific to this package 1507 --help=short display options specific to this package
1513 --help=recursive display the short help of all the included packages 1508 --help=recursive display the short help of all the included packages
1514 -V, --version display version information and exit 1509 -V, --version display version information and exit
1515 -q, --quiet, --silent do not print \`checking ...' messages 1510 -q, --quiet, --silent do not print \`checking...' messages
1516 --cache-file=FILE cache test results in FILE [disabled] 1511 --cache-file=FILE cache test results in FILE [disabled]
1517 -C, --config-cache alias for \`--cache-file=config.cache' 1512 -C, --config-cache alias for \`--cache-file=config.cache'
1518 -n, --no-create do not create output files 1513 -n, --no-create do not create output files
@@ -1568,7 +1563,7 @@ fi
1568 1563
1569if test -n "$ac_init_help"; then 1564if test -n "$ac_init_help"; then
1570 case $ac_init_help in 1565 case $ac_init_help in
1571 short | recursive ) echo "Configuration of eet 1.5.0:";; 1566 short | recursive ) echo "Configuration of eet 1.5.99.67344:";;
1572 esac 1567 esac
1573 cat <<\_ACEOF 1568 cat <<\_ACEOF
1574 1569
@@ -1628,10 +1623,6 @@ Some influential environment variables:
1628 you have headers in a nonstandard directory <include dir> 1623 you have headers in a nonstandard directory <include dir>
1629 CPP C preprocessor 1624 CPP C preprocessor
1630 PKG_CONFIG path to pkg-config utility 1625 PKG_CONFIG path to pkg-config utility
1631 PKG_CONFIG_PATH
1632 directories to add to pkg-config's search path
1633 PKG_CONFIG_LIBDIR
1634 path overriding pkg-config's built-in search path
1635 CHECK_CFLAGS 1626 CHECK_CFLAGS
1636 C compiler flags for CHECK, overriding pkg-config 1627 C compiler flags for CHECK, overriding pkg-config
1637 CHECK_LIBS linker flags for CHECK, overriding pkg-config 1628 CHECK_LIBS linker flags for CHECK, overriding pkg-config
@@ -1713,10 +1704,10 @@ fi
1713test -n "$ac_init_help" && exit $ac_status 1704test -n "$ac_init_help" && exit $ac_status
1714if $ac_init_version; then 1705if $ac_init_version; then
1715 cat <<\_ACEOF 1706 cat <<\_ACEOF
1716eet configure 1.5.0 1707eet configure 1.5.99.67344
1717generated by GNU Autoconf 2.67 1708generated by GNU Autoconf 2.65
1718 1709
1719Copyright (C) 2010 Free Software Foundation, Inc. 1710Copyright (C) 2009 Free Software Foundation, Inc.
1720This configure script is free software; the Free Software Foundation 1711This configure script is free software; the Free Software Foundation
1721gives unlimited permission to copy, distribute and modify it. 1712gives unlimited permission to copy, distribute and modify it.
1722_ACEOF 1713_ACEOF
@@ -1820,7 +1811,7 @@ ac_fn_c_check_header_compile ()
1820 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1811 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1821 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1812 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1822$as_echo_n "checking for $2... " >&6; } 1813$as_echo_n "checking for $2... " >&6; }
1823if eval "test \"\${$3+set}\"" = set; then : 1814if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1824 $as_echo_n "(cached) " >&6 1815 $as_echo_n "(cached) " >&6
1825else 1816else
1826 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1817 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1863,7 +1854,7 @@ $as_echo "$ac_try_echo"; } >&5
1863 mv -f conftest.er1 conftest.err 1854 mv -f conftest.er1 conftest.err
1864 fi 1855 fi
1865 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1856 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1866 test $ac_status = 0; } > conftest.i && { 1857 test $ac_status = 0; } >/dev/null && {
1867 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1858 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1868 test ! -s conftest.err 1859 test ! -s conftest.err
1869 }; then : 1860 }; then :
@@ -1929,7 +1920,7 @@ ac_fn_c_check_func ()
1929 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1920 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1930 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1921 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1931$as_echo_n "checking for $2... " >&6; } 1922$as_echo_n "checking for $2... " >&6; }
1932if eval "test \"\${$3+set}\"" = set; then : 1923if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1933 $as_echo_n "(cached) " >&6 1924 $as_echo_n "(cached) " >&6
1934else 1925else
1935 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1926 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1996,10 +1987,10 @@ $as_echo "$ac_res" >&6; }
1996ac_fn_c_check_header_mongrel () 1987ac_fn_c_check_header_mongrel ()
1997{ 1988{
1998 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1989 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1999 if eval "test \"\${$3+set}\"" = set; then : 1990 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2000 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1991 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2001$as_echo_n "checking for $2... " >&6; } 1992$as_echo_n "checking for $2... " >&6; }
2002if eval "test \"\${$3+set}\"" = set; then : 1993if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2003 $as_echo_n "(cached) " >&6 1994 $as_echo_n "(cached) " >&6
2004fi 1995fi
2005eval ac_res=\$$3 1996eval ac_res=\$$3
@@ -2035,7 +2026,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
2035else 2026else
2036 ac_header_preproc=no 2027 ac_header_preproc=no
2037fi 2028fi
2038rm -f conftest.err conftest.i conftest.$ac_ext 2029rm -f conftest.err conftest.$ac_ext
2039{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 2030{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2040$as_echo "$ac_header_preproc" >&6; } 2031$as_echo "$ac_header_preproc" >&6; }
2041 2032
@@ -2058,15 +2049,17 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2058$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 2049$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2059 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 2050 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2060$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 2051$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2061( $as_echo "## -------------------------------------------------------- ## 2052( cat <<\_ASBOX
2053## -------------------------------------------------------- ##
2062## Report this to enlightenment-devel@lists.sourceforge.net ## 2054## Report this to enlightenment-devel@lists.sourceforge.net ##
2063## -------------------------------------------------------- ##" 2055## -------------------------------------------------------- ##
2056_ASBOX
2064 ) | sed "s/^/$as_me: WARNING: /" >&2 2057 ) | sed "s/^/$as_me: WARNING: /" >&2
2065 ;; 2058 ;;
2066esac 2059esac
2067 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2060 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2068$as_echo_n "checking for $2... " >&6; } 2061$as_echo_n "checking for $2... " >&6; }
2069if eval "test \"\${$3+set}\"" = set; then : 2062if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2070 $as_echo_n "(cached) " >&6 2063 $as_echo_n "(cached) " >&6
2071else 2064else
2072 eval "$3=\$ac_header_compiler" 2065 eval "$3=\$ac_header_compiler"
@@ -2082,8 +2075,8 @@ cat >config.log <<_ACEOF
2082This file contains any messages produced by compilers while 2075This file contains any messages produced by compilers while
2083running configure, to aid debugging if configure makes a mistake. 2076running configure, to aid debugging if configure makes a mistake.
2084 2077
2085It was created by eet $as_me 1.5.0, which was 2078It was created by eet $as_me 1.5.99.67344, which was
2086generated by GNU Autoconf 2.67. Invocation command line was 2079generated by GNU Autoconf 2.65. Invocation command line was
2087 2080
2088 $ $0 $@ 2081 $ $0 $@
2089 2082
@@ -2193,9 +2186,11 @@ trap 'exit_status=$?
2193 { 2186 {
2194 echo 2187 echo
2195 2188
2196 $as_echo "## ---------------- ## 2189 cat <<\_ASBOX
2190## ---------------- ##
2197## Cache variables. ## 2191## Cache variables. ##
2198## ---------------- ##" 2192## ---------------- ##
2193_ASBOX
2199 echo 2194 echo
2200 # The following way of writing the cache mishandles newlines in values, 2195 # The following way of writing the cache mishandles newlines in values,
2201( 2196(
@@ -2229,9 +2224,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2229) 2224)
2230 echo 2225 echo
2231 2226
2232 $as_echo "## ----------------- ## 2227 cat <<\_ASBOX
2228## ----------------- ##
2233## Output variables. ## 2229## Output variables. ##
2234## ----------------- ##" 2230## ----------------- ##
2231_ASBOX
2235 echo 2232 echo
2236 for ac_var in $ac_subst_vars 2233 for ac_var in $ac_subst_vars
2237 do 2234 do
@@ -2244,9 +2241,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2244 echo 2241 echo
2245 2242
2246 if test -n "$ac_subst_files"; then 2243 if test -n "$ac_subst_files"; then
2247 $as_echo "## ------------------- ## 2244 cat <<\_ASBOX
2245## ------------------- ##
2248## File substitutions. ## 2246## File substitutions. ##
2249## ------------------- ##" 2247## ------------------- ##
2248_ASBOX
2250 echo 2249 echo
2251 for ac_var in $ac_subst_files 2250 for ac_var in $ac_subst_files
2252 do 2251 do
@@ -2260,9 +2259,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2260 fi 2259 fi
2261 2260
2262 if test -s confdefs.h; then 2261 if test -s confdefs.h; then
2263 $as_echo "## ----------- ## 2262 cat <<\_ASBOX
2263## ----------- ##
2264## confdefs.h. ## 2264## confdefs.h. ##
2265## ----------- ##" 2265## ----------- ##
2266_ASBOX
2266 echo 2267 echo
2267 cat confdefs.h 2268 cat confdefs.h
2268 echo 2269 echo
@@ -2317,12 +2318,7 @@ _ACEOF
2317ac_site_file1=NONE 2318ac_site_file1=NONE
2318ac_site_file2=NONE 2319ac_site_file2=NONE
2319if test -n "$CONFIG_SITE"; then 2320if test -n "$CONFIG_SITE"; then
2320 # We do not want a PATH search for config.site. 2321 ac_site_file1=$CONFIG_SITE
2321 case $CONFIG_SITE in #((
2322 -*) ac_site_file1=./$CONFIG_SITE;;
2323 */*) ac_site_file1=$CONFIG_SITE;;
2324 *) ac_site_file1=./$CONFIG_SITE;;
2325 esac
2326elif test "x$prefix" != xNONE; then 2322elif test "x$prefix" != xNONE; then
2327 ac_site_file1=$prefix/share/config.site 2323 ac_site_file1=$prefix/share/config.site
2328 ac_site_file2=$prefix/etc/config.site 2324 ac_site_file2=$prefix/etc/config.site
@@ -2337,11 +2333,7 @@ do
2337 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2333 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2338$as_echo "$as_me: loading site script $ac_site_file" >&6;} 2334$as_echo "$as_me: loading site script $ac_site_file" >&6;}
2339 sed 's/^/| /' "$ac_site_file" >&5 2335 sed 's/^/| /' "$ac_site_file" >&5
2340 . "$ac_site_file" \ 2336 . "$ac_site_file"
2341 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2342$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2343as_fn_error $? "failed to load site script $ac_site_file
2344See \`config.log' for more details" "$LINENO" 5 ; }
2345 fi 2337 fi
2346done 2338done
2347 2339
@@ -2417,7 +2409,7 @@ if $ac_cache_corrupted; then
2417$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2409$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2418 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2410 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2419$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2411$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2420 as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2412 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2421fi 2413fi
2422## -------------------- ## 2414## -------------------- ##
2423## Main body of script. ## 2415## Main body of script. ##
@@ -2443,22 +2435,16 @@ am__api_version='1.11'
2443 2435
2444ac_aux_dir= 2436ac_aux_dir=
2445for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2437for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2446 if test -f "$ac_dir/install-sh"; then 2438 for ac_t in install-sh install.sh shtool; do
2447 ac_aux_dir=$ac_dir 2439 if test -f "$ac_dir/$ac_t"; then
2448 ac_install_sh="$ac_aux_dir/install-sh -c" 2440 ac_aux_dir=$ac_dir
2449 break 2441 ac_install_sh="$ac_aux_dir/$ac_t -c"
2450 elif test -f "$ac_dir/install.sh"; then 2442 break 2
2451 ac_aux_dir=$ac_dir 2443 fi
2452 ac_install_sh="$ac_aux_dir/install.sh -c" 2444 done
2453 break
2454 elif test -f "$ac_dir/shtool"; then
2455 ac_aux_dir=$ac_dir
2456 ac_install_sh="$ac_aux_dir/shtool install -c"
2457 break
2458 fi
2459done 2445done
2460if test -z "$ac_aux_dir"; then 2446if test -z "$ac_aux_dir"; then
2461 as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2447 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
2462fi 2448fi
2463 2449
2464# These three variables are undocumented and unsupported, 2450# These three variables are undocumented and unsupported,
@@ -2574,11 +2560,11 @@ am_lf='
2574' 2560'
2575case `pwd` in 2561case `pwd` in
2576 *[\\\"\#\$\&\'\`$am_lf]*) 2562 *[\\\"\#\$\&\'\`$am_lf]*)
2577 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; 2563 as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
2578esac 2564esac
2579case $srcdir in 2565case $srcdir in
2580 *[\\\"\#\$\&\'\`$am_lf\ \ ]*) 2566 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2581 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; 2567 as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2582esac 2568esac
2583 2569
2584# Do `set' in a subshell so we don't clobber the current shell's 2570# Do `set' in a subshell so we don't clobber the current shell's
@@ -2600,7 +2586,7 @@ if (
2600 # if, for instance, CONFIG_SHELL is bash and it inherits a 2586 # if, for instance, CONFIG_SHELL is bash and it inherits a
2601 # broken ls alias from the environment. This has actually 2587 # broken ls alias from the environment. This has actually
2602 # happened. Such a system could not be considered "sane". 2588 # happened. Such a system could not be considered "sane".
2603 as_fn_error $? "ls -t appears to fail. Make sure there is not a broken 2589 as_fn_error "ls -t appears to fail. Make sure there is not a broken
2604alias in your environment" "$LINENO" 5 2590alias in your environment" "$LINENO" 5
2605 fi 2591 fi
2606 2592
@@ -2610,7 +2596,7 @@ then
2610 # Ok. 2596 # Ok.
2611 : 2597 :
2612else 2598else
2613 as_fn_error $? "newly created file is older than distributed files! 2599 as_fn_error "newly created file is older than distributed files!
2614Check your system clock" "$LINENO" 5 2600Check your system clock" "$LINENO" 5
2615fi 2601fi
2616{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2602{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2848,7 +2834,7 @@ done
2848$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 2834$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2849set x ${MAKE-make} 2835set x ${MAKE-make}
2850ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 2836ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2851if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : 2837if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
2852 $as_echo_n "(cached) " >&6 2838 $as_echo_n "(cached) " >&6
2853else 2839else
2854 cat >conftest.make <<\_ACEOF 2840 cat >conftest.make <<\_ACEOF
@@ -2856,7 +2842,7 @@ SHELL = /bin/sh
2856all: 2842all:
2857 @echo '@@@%%%=$(MAKE)=@@@%%%' 2843 @echo '@@@%%%=$(MAKE)=@@@%%%'
2858_ACEOF 2844_ACEOF
2859# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 2845# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
2860case `${MAKE-make} -f conftest.make 2>/dev/null` in 2846case `${MAKE-make} -f conftest.make 2>/dev/null` in
2861 *@@@%%%=?*=@@@%%%*) 2847 *@@@%%%=?*=@@@%%%*)
2862 eval ac_cv_prog_make_${ac_make}_set=yes;; 2848 eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2890,7 +2876,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
2890 am__isrc=' -I$(srcdir)' 2876 am__isrc=' -I$(srcdir)'
2891 # test to see if srcdir already configured 2877 # test to see if srcdir already configured
2892 if test -f $srcdir/config.status; then 2878 if test -f $srcdir/config.status; then
2893 as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 2879 as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
2894 fi 2880 fi
2895fi 2881fi
2896 2882
@@ -2906,7 +2892,7 @@ fi
2906 2892
2907# Define the identity of the package. 2893# Define the identity of the package.
2908 PACKAGE='eet' 2894 PACKAGE='eet'
2909 VERSION='1.5.0' 2895 VERSION='1.5.99.67344'
2910 2896
2911 2897
2912cat >>confdefs.h <<_ACEOF 2898cat >>confdefs.h <<_ACEOF
@@ -2961,7 +2947,7 @@ AM_BACKSLASH='\'
2961 2947
2962# Make sure we can run config.sub. 2948# Make sure we can run config.sub.
2963$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 2949$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
2964 as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 2950 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
2965 2951
2966{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 2952{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
2967$as_echo_n "checking build system type... " >&6; } 2953$as_echo_n "checking build system type... " >&6; }
@@ -2972,16 +2958,16 @@ else
2972test "x$ac_build_alias" = x && 2958test "x$ac_build_alias" = x &&
2973 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 2959 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
2974test "x$ac_build_alias" = x && 2960test "x$ac_build_alias" = x &&
2975 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 2961 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
2976ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 2962ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
2977 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 2963 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
2978 2964
2979fi 2965fi
2980{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 2966{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
2981$as_echo "$ac_cv_build" >&6; } 2967$as_echo "$ac_cv_build" >&6; }
2982case $ac_cv_build in 2968case $ac_cv_build in
2983*-*-*) ;; 2969*-*-*) ;;
2984*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 2970*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
2985esac 2971esac
2986build=$ac_cv_build 2972build=$ac_cv_build
2987ac_save_IFS=$IFS; IFS='-' 2973ac_save_IFS=$IFS; IFS='-'
@@ -3006,7 +2992,7 @@ else
3006 ac_cv_host=$ac_cv_build 2992 ac_cv_host=$ac_cv_build
3007else 2993else
3008 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 2994 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
3009 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 2995 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
3010fi 2996fi
3011 2997
3012fi 2998fi
@@ -3014,7 +3000,7 @@ fi
3014$as_echo "$ac_cv_host" >&6; } 3000$as_echo "$ac_cv_host" >&6; }
3015case $ac_cv_host in 3001case $ac_cv_host in
3016*-*-*) ;; 3002*-*-*) ;;
3017*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 3003*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
3018esac 3004esac
3019host=$ac_cv_host 3005host=$ac_cv_host
3020ac_save_IFS=$IFS; IFS='-' 3006ac_save_IFS=$IFS; IFS='-'
@@ -3720,8 +3706,8 @@ fi
3720 3706
3721test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3707test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3722$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3708$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3723as_fn_error $? "no acceptable C compiler found in \$PATH 3709as_fn_error "no acceptable C compiler found in \$PATH
3724See \`config.log' for more details" "$LINENO" 5 ; } 3710See \`config.log' for more details." "$LINENO" 5; }
3725 3711
3726# Provide some information about the compiler. 3712# Provide some information about the compiler.
3727$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 3713$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3835,8 +3821,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
3835 3821
3836{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3822{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3837$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3823$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3838as_fn_error 77 "C compiler cannot create executables 3824{ as_fn_set_status 77
3839See \`config.log' for more details" "$LINENO" 5 ; } 3825as_fn_error "C compiler cannot create executables
3826See \`config.log' for more details." "$LINENO" 5; }; }
3840else 3827else
3841 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3828 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3842$as_echo "yes" >&6; } 3829$as_echo "yes" >&6; }
@@ -3878,8 +3865,8 @@ done
3878else 3865else
3879 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3866 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3880$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3867$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3881as_fn_error $? "cannot compute suffix of executables: cannot compile and link 3868as_fn_error "cannot compute suffix of executables: cannot compile and link
3882See \`config.log' for more details" "$LINENO" 5 ; } 3869See \`config.log' for more details." "$LINENO" 5; }
3883fi 3870fi
3884rm -f conftest conftest$ac_cv_exeext 3871rm -f conftest conftest$ac_cv_exeext
3885{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 3872{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3936,9 +3923,9 @@ $as_echo "$ac_try_echo"; } >&5
3936 else 3923 else
3937 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3924 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3938$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3925$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3939as_fn_error $? "cannot run C compiled programs. 3926as_fn_error "cannot run C compiled programs.
3940If you meant to cross compile, use \`--host'. 3927If you meant to cross compile, use \`--host'.
3941See \`config.log' for more details" "$LINENO" 5 ; } 3928See \`config.log' for more details." "$LINENO" 5; }
3942 fi 3929 fi
3943 fi 3930 fi
3944fi 3931fi
@@ -3989,8 +3976,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
3989 3976
3990{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3977{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3991$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3978$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3992as_fn_error $? "cannot compute suffix of object files: cannot compile 3979as_fn_error "cannot compute suffix of object files: cannot compile
3993See \`config.log' for more details" "$LINENO" 5 ; } 3980See \`config.log' for more details." "$LINENO" 5; }
3994fi 3981fi
3995rm -f conftest.$ac_cv_objext conftest.$ac_ext 3982rm -f conftest.$ac_cv_objext conftest.$ac_ext
3996fi 3983fi
@@ -4394,7 +4381,7 @@ esac
4394 done 4381 done
4395IFS=$as_save_IFS 4382IFS=$as_save_IFS
4396 if test -z "$ac_cv_path_SED"; then 4383 if test -z "$ac_cv_path_SED"; then
4397 as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 4384 as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
4398 fi 4385 fi
4399else 4386else
4400 ac_cv_path_SED=$SED 4387 ac_cv_path_SED=$SED
@@ -4470,7 +4457,7 @@ esac
4470 done 4457 done
4471IFS=$as_save_IFS 4458IFS=$as_save_IFS
4472 if test -z "$ac_cv_path_GREP"; then 4459 if test -z "$ac_cv_path_GREP"; then
4473 as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4460 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4474 fi 4461 fi
4475else 4462else
4476 ac_cv_path_GREP=$GREP 4463 ac_cv_path_GREP=$GREP
@@ -4536,7 +4523,7 @@ esac
4536 done 4523 done
4537IFS=$as_save_IFS 4524IFS=$as_save_IFS
4538 if test -z "$ac_cv_path_EGREP"; then 4525 if test -z "$ac_cv_path_EGREP"; then
4539 as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4526 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4540 fi 4527 fi
4541else 4528else
4542 ac_cv_path_EGREP=$EGREP 4529 ac_cv_path_EGREP=$EGREP
@@ -4603,7 +4590,7 @@ esac
4603 done 4590 done
4604IFS=$as_save_IFS 4591IFS=$as_save_IFS
4605 if test -z "$ac_cv_path_FGREP"; then 4592 if test -z "$ac_cv_path_FGREP"; then
4606 as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4593 as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4607 fi 4594 fi
4608else 4595else
4609 ac_cv_path_FGREP=$FGREP 4596 ac_cv_path_FGREP=$FGREP
@@ -4719,7 +4706,7 @@ else
4719 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4706 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4720$as_echo "no" >&6; } 4707$as_echo "no" >&6; }
4721fi 4708fi
4722test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 4709test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
4723{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 4710{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
4724$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } 4711$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
4725if test "${lt_cv_prog_gnu_ld+set}" = set; then : 4712if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -4921,13 +4908,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
4921else 4908else
4922 lt_cv_nm_interface="BSD nm" 4909 lt_cv_nm_interface="BSD nm"
4923 echo "int some_variable = 0;" > conftest.$ac_ext 4910 echo "int some_variable = 0;" > conftest.$ac_ext
4924 (eval echo "\"\$as_me:4924: $ac_compile\"" >&5) 4911 (eval echo "\"\$as_me:4911: $ac_compile\"" >&5)
4925 (eval "$ac_compile" 2>conftest.err) 4912 (eval "$ac_compile" 2>conftest.err)
4926 cat conftest.err >&5 4913 cat conftest.err >&5
4927 (eval echo "\"\$as_me:4927: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 4914 (eval echo "\"\$as_me:4914: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
4928 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 4915 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
4929 cat conftest.err >&5 4916 cat conftest.err >&5
4930 (eval echo "\"\$as_me:4930: output\"" >&5) 4917 (eval echo "\"\$as_me:4917: output\"" >&5)
4931 cat conftest.out >&5 4918 cat conftest.out >&5
4932 if $GREP 'External.*some_variable' conftest.out > /dev/null; then 4919 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
4933 lt_cv_nm_interface="MS dumpbin" 4920 lt_cv_nm_interface="MS dumpbin"
@@ -6130,7 +6117,7 @@ ia64-*-hpux*)
6130 ;; 6117 ;;
6131*-*-irix6*) 6118*-*-irix6*)
6132 # Find out which ABI we are using. 6119 # Find out which ABI we are using.
6133 echo '#line 6133 "configure"' > conftest.$ac_ext 6120 echo '#line 6120 "configure"' > conftest.$ac_ext
6134 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 6121 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
6135 (eval $ac_compile) 2>&5 6122 (eval $ac_compile) 2>&5
6136 ac_status=$? 6123 ac_status=$?
@@ -6919,7 +6906,7 @@ else
6919 # Broken: fails on valid input. 6906 # Broken: fails on valid input.
6920continue 6907continue
6921fi 6908fi
6922rm -f conftest.err conftest.i conftest.$ac_ext 6909rm -f conftest.err conftest.$ac_ext
6923 6910
6924 # OK, works on sane cases. Now check whether nonexistent headers 6911 # OK, works on sane cases. Now check whether nonexistent headers
6925 # can be detected and how. 6912 # can be detected and how.
@@ -6935,11 +6922,11 @@ else
6935ac_preproc_ok=: 6922ac_preproc_ok=:
6936break 6923break
6937fi 6924fi
6938rm -f conftest.err conftest.i conftest.$ac_ext 6925rm -f conftest.err conftest.$ac_ext
6939 6926
6940done 6927done
6941# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 6928# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
6942rm -f conftest.i conftest.err conftest.$ac_ext 6929rm -f conftest.err conftest.$ac_ext
6943if $ac_preproc_ok; then : 6930if $ac_preproc_ok; then :
6944 break 6931 break
6945fi 6932fi
@@ -6978,7 +6965,7 @@ else
6978 # Broken: fails on valid input. 6965 # Broken: fails on valid input.
6979continue 6966continue
6980fi 6967fi
6981rm -f conftest.err conftest.i conftest.$ac_ext 6968rm -f conftest.err conftest.$ac_ext
6982 6969
6983 # OK, works on sane cases. Now check whether nonexistent headers 6970 # OK, works on sane cases. Now check whether nonexistent headers
6984 # can be detected and how. 6971 # can be detected and how.
@@ -6994,18 +6981,18 @@ else
6994ac_preproc_ok=: 6981ac_preproc_ok=:
6995break 6982break
6996fi 6983fi
6997rm -f conftest.err conftest.i conftest.$ac_ext 6984rm -f conftest.err conftest.$ac_ext
6998 6985
6999done 6986done
7000# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 6987# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7001rm -f conftest.i conftest.err conftest.$ac_ext 6988rm -f conftest.err conftest.$ac_ext
7002if $ac_preproc_ok; then : 6989if $ac_preproc_ok; then :
7003 6990
7004else 6991else
7005 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 6992 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7006$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 6993$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7007as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 6994as_fn_error "C preprocessor \"$CPP\" fails sanity check
7008See \`config.log' for more details" "$LINENO" 5 ; } 6995See \`config.log' for more details." "$LINENO" 5; }
7009fi 6996fi
7010 6997
7011ac_ext=c 6998ac_ext=c
@@ -7134,7 +7121,8 @@ do :
7134 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 7121 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7135ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 7122ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
7136" 7123"
7137if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 7124eval as_val=\$$as_ac_Header
7125 if test "x$as_val" = x""yes; then :
7138 cat >>confdefs.h <<_ACEOF 7126 cat >>confdefs.h <<_ACEOF
7139#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 7127#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7140_ACEOF 7128_ACEOF
@@ -7657,11 +7645,11 @@ else
7657 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 7645 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7658 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7646 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7659 -e 's:$: $lt_compiler_flag:'` 7647 -e 's:$: $lt_compiler_flag:'`
7660 (eval echo "\"\$as_me:7660: $lt_compile\"" >&5) 7648 (eval echo "\"\$as_me:7648: $lt_compile\"" >&5)
7661 (eval "$lt_compile" 2>conftest.err) 7649 (eval "$lt_compile" 2>conftest.err)
7662 ac_status=$? 7650 ac_status=$?
7663 cat conftest.err >&5 7651 cat conftest.err >&5
7664 echo "$as_me:7664: \$? = $ac_status" >&5 7652 echo "$as_me:7652: \$? = $ac_status" >&5
7665 if (exit $ac_status) && test -s "$ac_outfile"; then 7653 if (exit $ac_status) && test -s "$ac_outfile"; then
7666 # The compiler can only warn and ignore the option if not recognized 7654 # The compiler can only warn and ignore the option if not recognized
7667 # So say no if there are warnings other than the usual output. 7655 # So say no if there are warnings other than the usual output.
@@ -7996,11 +7984,11 @@ else
7996 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 7984 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7997 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7985 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7998 -e 's:$: $lt_compiler_flag:'` 7986 -e 's:$: $lt_compiler_flag:'`
7999 (eval echo "\"\$as_me:7999: $lt_compile\"" >&5) 7987 (eval echo "\"\$as_me:7987: $lt_compile\"" >&5)
8000 (eval "$lt_compile" 2>conftest.err) 7988 (eval "$lt_compile" 2>conftest.err)
8001 ac_status=$? 7989 ac_status=$?
8002 cat conftest.err >&5 7990 cat conftest.err >&5
8003 echo "$as_me:8003: \$? = $ac_status" >&5 7991 echo "$as_me:7991: \$? = $ac_status" >&5
8004 if (exit $ac_status) && test -s "$ac_outfile"; then 7992 if (exit $ac_status) && test -s "$ac_outfile"; then
8005 # The compiler can only warn and ignore the option if not recognized 7993 # The compiler can only warn and ignore the option if not recognized
8006 # So say no if there are warnings other than the usual output. 7994 # So say no if there are warnings other than the usual output.
@@ -8101,11 +8089,11 @@ else
8101 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 8089 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8102 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8090 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8103 -e 's:$: $lt_compiler_flag:'` 8091 -e 's:$: $lt_compiler_flag:'`
8104 (eval echo "\"\$as_me:8104: $lt_compile\"" >&5) 8092 (eval echo "\"\$as_me:8092: $lt_compile\"" >&5)
8105 (eval "$lt_compile" 2>out/conftest.err) 8093 (eval "$lt_compile" 2>out/conftest.err)
8106 ac_status=$? 8094 ac_status=$?
8107 cat out/conftest.err >&5 8095 cat out/conftest.err >&5
8108 echo "$as_me:8108: \$? = $ac_status" >&5 8096 echo "$as_me:8096: \$? = $ac_status" >&5
8109 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8097 if (exit $ac_status) && test -s out/conftest2.$ac_objext
8110 then 8098 then
8111 # The compiler can only warn and ignore the option if not recognized 8099 # The compiler can only warn and ignore the option if not recognized
@@ -8156,11 +8144,11 @@ else
8156 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 8144 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8157 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8145 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8158 -e 's:$: $lt_compiler_flag:'` 8146 -e 's:$: $lt_compiler_flag:'`
8159 (eval echo "\"\$as_me:8159: $lt_compile\"" >&5) 8147 (eval echo "\"\$as_me:8147: $lt_compile\"" >&5)
8160 (eval "$lt_compile" 2>out/conftest.err) 8148 (eval "$lt_compile" 2>out/conftest.err)
8161 ac_status=$? 8149 ac_status=$?
8162 cat out/conftest.err >&5 8150 cat out/conftest.err >&5
8163 echo "$as_me:8163: \$? = $ac_status" >&5 8151 echo "$as_me:8151: \$? = $ac_status" >&5
8164 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8152 if (exit $ac_status) && test -s out/conftest2.$ac_objext
8165 then 8153 then
8166 # The compiler can only warn and ignore the option if not recognized 8154 # The compiler can only warn and ignore the option if not recognized
@@ -10540,7 +10528,7 @@ else
10540 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 10528 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10541 lt_status=$lt_dlunknown 10529 lt_status=$lt_dlunknown
10542 cat > conftest.$ac_ext <<_LT_EOF 10530 cat > conftest.$ac_ext <<_LT_EOF
10543#line 10543 "configure" 10531#line 10531 "configure"
10544#include "confdefs.h" 10532#include "confdefs.h"
10545 10533
10546#if HAVE_DLFCN_H 10534#if HAVE_DLFCN_H
@@ -10636,7 +10624,7 @@ else
10636 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 10624 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10637 lt_status=$lt_dlunknown 10625 lt_status=$lt_dlunknown
10638 cat > conftest.$ac_ext <<_LT_EOF 10626 cat > conftest.$ac_ext <<_LT_EOF
10639#line 10639 "configure" 10627#line 10627 "configure"
10640#include "confdefs.h" 10628#include "confdefs.h"
10641 10629
10642#if HAVE_DLFCN_H 10630#if HAVE_DLFCN_H
@@ -10880,15 +10868,15 @@ _ACEOF
10880 10868
10881 10869
10882cat >>confdefs.h <<_ACEOF 10870cat >>confdefs.h <<_ACEOF
10883#define VMIC 0 10871#define VMIC 99
10884_ACEOF 10872_ACEOF
10885 10873
10886 10874
10887cat >>confdefs.h <<_ACEOF 10875cat >>confdefs.h <<_ACEOF
10888#define VREV 0 10876#define VREV 67344
10889_ACEOF 10877_ACEOF
10890 10878
10891version_info="6:0:5" 10879version_info="6:99:5"
10892release_info="" 10880release_info=""
10893 10881
10894 10882
@@ -11182,10 +11170,6 @@ fi
11182 11170
11183 11171
11184 11172
11185
11186
11187
11188
11189if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 11173if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
11190 if test -n "$ac_tool_prefix"; then 11174 if test -n "$ac_tool_prefix"; then
11191 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. 11175 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -11298,6 +11282,7 @@ $as_echo "yes" >&6; }
11298$as_echo "no" >&6; } 11282$as_echo "no" >&6; }
11299 PKG_CONFIG="" 11283 PKG_CONFIG=""
11300 fi 11284 fi
11285
11301fi 11286fi
11302 11287
11303 11288
@@ -11329,10 +11314,11 @@ pkg_failed=no
11329{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 11314{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
11330$as_echo_n "checking for CHECK... " >&6; } 11315$as_echo_n "checking for CHECK... " >&6; }
11331 11316
11332if test -n "$CHECK_CFLAGS"; then 11317if test -n "$PKG_CONFIG"; then
11333 pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" 11318 if test -n "$CHECK_CFLAGS"; then
11334 elif test -n "$PKG_CONFIG"; then 11319 pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
11335 if test -n "$PKG_CONFIG" && \ 11320 else
11321 if test -n "$PKG_CONFIG" && \
11336 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 11322 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
11337 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 11323 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
11338 ac_status=$? 11324 ac_status=$?
@@ -11342,13 +11328,15 @@ if test -n "$CHECK_CFLAGS"; then
11342else 11328else
11343 pkg_failed=yes 11329 pkg_failed=yes
11344fi 11330fi
11345 else 11331 fi
11346 pkg_failed=untried 11332else
11333 pkg_failed=untried
11347fi 11334fi
11348if test -n "$CHECK_LIBS"; then 11335if test -n "$PKG_CONFIG"; then
11349 pkg_cv_CHECK_LIBS="$CHECK_LIBS" 11336 if test -n "$CHECK_LIBS"; then
11350 elif test -n "$PKG_CONFIG"; then 11337 pkg_cv_CHECK_LIBS="$CHECK_LIBS"
11351 if test -n "$PKG_CONFIG" && \ 11338 else
11339 if test -n "$PKG_CONFIG" && \
11352 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 11340 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
11353 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 11341 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
11354 ac_status=$? 11342 ac_status=$?
@@ -11358,15 +11346,14 @@ if test -n "$CHECK_LIBS"; then
11358else 11346else
11359 pkg_failed=yes 11347 pkg_failed=yes
11360fi 11348fi
11361 else 11349 fi
11362 pkg_failed=untried 11350else
11351 pkg_failed=untried
11363fi 11352fi
11364 11353
11365 11354
11366 11355
11367if test $pkg_failed = yes; then 11356if test $pkg_failed = yes; then
11368 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11369$as_echo "no" >&6; }
11370 11357
11371if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 11358if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
11372 _pkg_short_errors_supported=yes 11359 _pkg_short_errors_supported=yes
@@ -11374,17 +11361,17 @@ else
11374 _pkg_short_errors_supported=no 11361 _pkg_short_errors_supported=no
11375fi 11362fi
11376 if test $_pkg_short_errors_supported = yes; then 11363 if test $_pkg_short_errors_supported = yes; then
11377 CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1` 11364 CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check >= 0.9.5"`
11378 else 11365 else
11379 CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1` 11366 CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.5"`
11380 fi 11367 fi
11381 # Put the nasty error message in config.log where it belongs 11368 # Put the nasty error message in config.log where it belongs
11382 echo "$CHECK_PKG_ERRORS" >&5 11369 echo "$CHECK_PKG_ERRORS" >&5
11383 11370
11384 _efl_enable_tests="no" 11371 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11385elif test $pkg_failed = untried; then
11386 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11387$as_echo "no" >&6; } 11372$as_echo "no" >&6; }
11373 _efl_enable_tests="no"
11374elif test $pkg_failed = untried; then
11388 _efl_enable_tests="no" 11375 _efl_enable_tests="no"
11389else 11376else
11390 CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS 11377 CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
@@ -11821,8 +11808,8 @@ fi
11821 11808
11822test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 11809test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11823$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 11810$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11824as_fn_error $? "no acceptable C compiler found in \$PATH 11811as_fn_error "no acceptable C compiler found in \$PATH
11825See \`config.log' for more details" "$LINENO" 5 ; } 11812See \`config.log' for more details." "$LINENO" 5; }
11826 11813
11827# Provide some information about the compiler. 11814# Provide some information about the compiler.
11828$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 11815$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -12192,10 +12179,6 @@ fi
12192# pkg-config 12179# pkg-config
12193 12180
12194 12181
12195
12196
12197
12198
12199if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 12182if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
12200 if test -n "$ac_tool_prefix"; then 12183 if test -n "$ac_tool_prefix"; then
12201 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. 12184 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -12308,6 +12291,7 @@ $as_echo "yes" >&6; }
12308$as_echo "no" >&6; } 12291$as_echo "no" >&6; }
12309 PKG_CONFIG="" 12292 PKG_CONFIG=""
12310 fi 12293 fi
12294
12311fi 12295fi
12312 12296
12313# Check whether pkg-config supports Requires.private 12297# Check whether pkg-config supports Requires.private
@@ -12492,10 +12476,11 @@ pkg_failed=no
12492{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5 12476{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5
12493$as_echo_n "checking for EVIL... " >&6; } 12477$as_echo_n "checking for EVIL... " >&6; }
12494 12478
12495if test -n "$EVIL_CFLAGS"; then 12479if test -n "$PKG_CONFIG"; then
12496 pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS" 12480 if test -n "$EVIL_CFLAGS"; then
12497 elif test -n "$PKG_CONFIG"; then 12481 pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
12498 if test -n "$PKG_CONFIG" && \ 12482 else
12483 if test -n "$PKG_CONFIG" && \
12499 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 12484 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
12500 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 12485 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
12501 ac_status=$? 12486 ac_status=$?
@@ -12505,13 +12490,15 @@ if test -n "$EVIL_CFLAGS"; then
12505else 12490else
12506 pkg_failed=yes 12491 pkg_failed=yes
12507fi 12492fi
12508 else 12493 fi
12509 pkg_failed=untried 12494else
12495 pkg_failed=untried
12510fi 12496fi
12511if test -n "$EVIL_LIBS"; then 12497if test -n "$PKG_CONFIG"; then
12512 pkg_cv_EVIL_LIBS="$EVIL_LIBS" 12498 if test -n "$EVIL_LIBS"; then
12513 elif test -n "$PKG_CONFIG"; then 12499 pkg_cv_EVIL_LIBS="$EVIL_LIBS"
12514 if test -n "$PKG_CONFIG" && \ 12500 else
12501 if test -n "$PKG_CONFIG" && \
12515 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 12502 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
12516 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 12503 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
12517 ac_status=$? 12504 ac_status=$?
@@ -12521,15 +12508,14 @@ if test -n "$EVIL_LIBS"; then
12521else 12508else
12522 pkg_failed=yes 12509 pkg_failed=yes
12523fi 12510fi
12524 else 12511 fi
12525 pkg_failed=untried 12512else
12513 pkg_failed=untried
12526fi 12514fi
12527 12515
12528 12516
12529 12517
12530if test $pkg_failed = yes; then 12518if test $pkg_failed = yes; then
12531 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12532$as_echo "no" >&6; }
12533 12519
12534if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12520if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12535 _pkg_short_errors_supported=yes 12521 _pkg_short_errors_supported=yes
@@ -12537,14 +12523,14 @@ else
12537 _pkg_short_errors_supported=no 12523 _pkg_short_errors_supported=no
12538fi 12524fi
12539 if test $_pkg_short_errors_supported = yes; then 12525 if test $_pkg_short_errors_supported = yes; then
12540 EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil >= 1.0.0" 2>&1` 12526 EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evil >= 1.0.0"`
12541 else 12527 else
12542 EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.0.0" 2>&1` 12528 EVIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evil >= 1.0.0"`
12543 fi 12529 fi
12544 # Put the nasty error message in config.log where it belongs 12530 # Put the nasty error message in config.log where it belongs
12545 echo "$EVIL_PKG_ERRORS" >&5 12531 echo "$EVIL_PKG_ERRORS" >&5
12546 12532
12547 as_fn_error $? "Package requirements (evil >= 1.0.0) were not met: 12533 as_fn_error "Package requirements (evil >= 1.0.0) were not met:
12548 12534
12549$EVIL_PKG_ERRORS 12535$EVIL_PKG_ERRORS
12550 12536
@@ -12553,13 +12539,12 @@ installed software in a non-standard prefix.
12553 12539
12554Alternatively, you may set the environment variables EVIL_CFLAGS 12540Alternatively, you may set the environment variables EVIL_CFLAGS
12555and EVIL_LIBS to avoid the need to call pkg-config. 12541and EVIL_LIBS to avoid the need to call pkg-config.
12556See the pkg-config man page for more details." "$LINENO" 5 12542See the pkg-config man page for more details.
12543" "$LINENO" 5
12557elif test $pkg_failed = untried; then 12544elif test $pkg_failed = untried; then
12558 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12559$as_echo "no" >&6; }
12560 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 12545 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12561$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 12546$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12562as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 12547as_fn_error "The pkg-config script could not be found or is too old. Make sure it
12563is in your PATH or set the PKG_CONFIG environment variable to the full 12548is in your PATH or set the PKG_CONFIG environment variable to the full
12564path to pkg-config. 12549path to pkg-config.
12565 12550
@@ -12568,13 +12553,13 @@ and EVIL_LIBS to avoid the need to call pkg-config.
12568See the pkg-config man page for more details. 12553See the pkg-config man page for more details.
12569 12554
12570To get pkg-config, see <http://pkg-config.freedesktop.org/>. 12555To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12571See \`config.log' for more details" "$LINENO" 5 ; } 12556See \`config.log' for more details." "$LINENO" 5; }
12572else 12557else
12573 EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS 12558 EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS
12574 EVIL_LIBS=$pkg_cv_EVIL_LIBS 12559 EVIL_LIBS=$pkg_cv_EVIL_LIBS
12575 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 12560 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12576$as_echo "yes" >&6; } 12561$as_echo "yes" >&6; }
12577 12562 :
12578fi 12563fi
12579 12564
12580$as_echo "#define HAVE_EVIL 1" >>confdefs.h 12565$as_echo "#define HAVE_EVIL 1" >>confdefs.h
@@ -12603,10 +12588,11 @@ pkg_failed=no
12603{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EINA" >&5 12588{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EINA" >&5
12604$as_echo_n "checking for EINA... " >&6; } 12589$as_echo_n "checking for EINA... " >&6; }
12605 12590
12606if test -n "$EINA_CFLAGS"; then 12591if test -n "$PKG_CONFIG"; then
12607 pkg_cv_EINA_CFLAGS="$EINA_CFLAGS" 12592 if test -n "$EINA_CFLAGS"; then
12608 elif test -n "$PKG_CONFIG"; then 12593 pkg_cv_EINA_CFLAGS="$EINA_CFLAGS"
12609 if test -n "$PKG_CONFIG" && \ 12594 else
12595 if test -n "$PKG_CONFIG" && \
12610 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5 12596 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5
12611 ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5 12597 ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5
12612 ac_status=$? 12598 ac_status=$?
@@ -12616,13 +12602,15 @@ if test -n "$EINA_CFLAGS"; then
12616else 12602else
12617 pkg_failed=yes 12603 pkg_failed=yes
12618fi 12604fi
12619 else 12605 fi
12620 pkg_failed=untried 12606else
12607 pkg_failed=untried
12621fi 12608fi
12622if test -n "$EINA_LIBS"; then 12609if test -n "$PKG_CONFIG"; then
12623 pkg_cv_EINA_LIBS="$EINA_LIBS" 12610 if test -n "$EINA_LIBS"; then
12624 elif test -n "$PKG_CONFIG"; then 12611 pkg_cv_EINA_LIBS="$EINA_LIBS"
12625 if test -n "$PKG_CONFIG" && \ 12612 else
12613 if test -n "$PKG_CONFIG" && \
12626 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5 12614 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5
12627 ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5 12615 ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5
12628 ac_status=$? 12616 ac_status=$?
@@ -12632,15 +12620,14 @@ if test -n "$EINA_LIBS"; then
12632else 12620else
12633 pkg_failed=yes 12621 pkg_failed=yes
12634fi 12622fi
12635 else 12623 fi
12636 pkg_failed=untried 12624else
12625 pkg_failed=untried
12637fi 12626fi
12638 12627
12639 12628
12640 12629
12641if test $pkg_failed = yes; then 12630if test $pkg_failed = yes; then
12642 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12643$as_echo "no" >&6; }
12644 12631
12645if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12632if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12646 _pkg_short_errors_supported=yes 12633 _pkg_short_errors_supported=yes
@@ -12648,14 +12635,14 @@ else
12648 _pkg_short_errors_supported=no 12635 _pkg_short_errors_supported=no
12649fi 12636fi
12650 if test $_pkg_short_errors_supported = yes; then 12637 if test $_pkg_short_errors_supported = yes; then
12651 EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eina >= 1.1.0" 2>&1` 12638 EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "eina >= 1.1.0"`
12652 else 12639 else
12653 EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors "eina >= 1.1.0" 2>&1` 12640 EINA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "eina >= 1.1.0"`
12654 fi 12641 fi
12655 # Put the nasty error message in config.log where it belongs 12642 # Put the nasty error message in config.log where it belongs
12656 echo "$EINA_PKG_ERRORS" >&5 12643 echo "$EINA_PKG_ERRORS" >&5
12657 12644
12658 as_fn_error $? "Package requirements (eina >= 1.1.0) were not met: 12645 as_fn_error "Package requirements (eina >= 1.1.0) were not met:
12659 12646
12660$EINA_PKG_ERRORS 12647$EINA_PKG_ERRORS
12661 12648
@@ -12664,13 +12651,12 @@ installed software in a non-standard prefix.
12664 12651
12665Alternatively, you may set the environment variables EINA_CFLAGS 12652Alternatively, you may set the environment variables EINA_CFLAGS
12666and EINA_LIBS to avoid the need to call pkg-config. 12653and EINA_LIBS to avoid the need to call pkg-config.
12667See the pkg-config man page for more details." "$LINENO" 5 12654See the pkg-config man page for more details.
12655" "$LINENO" 5
12668elif test $pkg_failed = untried; then 12656elif test $pkg_failed = untried; then
12669 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12670$as_echo "no" >&6; }
12671 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 12657 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12672$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 12658$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12673as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 12659as_fn_error "The pkg-config script could not be found or is too old. Make sure it
12674is in your PATH or set the PKG_CONFIG environment variable to the full 12660is in your PATH or set the PKG_CONFIG environment variable to the full
12675path to pkg-config. 12661path to pkg-config.
12676 12662
@@ -12679,13 +12665,13 @@ and EINA_LIBS to avoid the need to call pkg-config.
12679See the pkg-config man page for more details. 12665See the pkg-config man page for more details.
12680 12666
12681To get pkg-config, see <http://pkg-config.freedesktop.org/>. 12667To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12682See \`config.log' for more details" "$LINENO" 5 ; } 12668See \`config.log' for more details." "$LINENO" 5; }
12683else 12669else
12684 EINA_CFLAGS=$pkg_cv_EINA_CFLAGS 12670 EINA_CFLAGS=$pkg_cv_EINA_CFLAGS
12685 EINA_LIBS=$pkg_cv_EINA_LIBS 12671 EINA_LIBS=$pkg_cv_EINA_LIBS
12686 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 12672 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12687$as_echo "yes" >&6; } 12673$as_echo "yes" >&6; }
12688 12674 :
12689fi 12675fi
12690requirement_eet="eina >= 1.1.0 ${requirement_eet}" 12676requirement_eet="eina >= 1.1.0 ${requirement_eet}"
12691 12677
@@ -12697,10 +12683,11 @@ pkg_failed=no
12697{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5 12683{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
12698$as_echo_n "checking for GNUTLS... " >&6; } 12684$as_echo_n "checking for GNUTLS... " >&6; }
12699 12685
12700if test -n "$GNUTLS_CFLAGS"; then 12686if test -n "$PKG_CONFIG"; then
12701 pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS" 12687 if test -n "$GNUTLS_CFLAGS"; then
12702 elif test -n "$PKG_CONFIG"; then 12688 pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
12703 if test -n "$PKG_CONFIG" && \ 12689 else
12690 if test -n "$PKG_CONFIG" && \
12704 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.7.6\""; } >&5 12691 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.7.6\""; } >&5
12705 ($PKG_CONFIG --exists --print-errors "gnutls >= 1.7.6") 2>&5 12692 ($PKG_CONFIG --exists --print-errors "gnutls >= 1.7.6") 2>&5
12706 ac_status=$? 12693 ac_status=$?
@@ -12710,13 +12697,15 @@ if test -n "$GNUTLS_CFLAGS"; then
12710else 12697else
12711 pkg_failed=yes 12698 pkg_failed=yes
12712fi 12699fi
12713 else 12700 fi
12714 pkg_failed=untried 12701else
12702 pkg_failed=untried
12715fi 12703fi
12716if test -n "$GNUTLS_LIBS"; then 12704if test -n "$PKG_CONFIG"; then
12717 pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS" 12705 if test -n "$GNUTLS_LIBS"; then
12718 elif test -n "$PKG_CONFIG"; then 12706 pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
12719 if test -n "$PKG_CONFIG" && \ 12707 else
12708 if test -n "$PKG_CONFIG" && \
12720 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.7.6\""; } >&5 12709 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.7.6\""; } >&5
12721 ($PKG_CONFIG --exists --print-errors "gnutls >= 1.7.6") 2>&5 12710 ($PKG_CONFIG --exists --print-errors "gnutls >= 1.7.6") 2>&5
12722 ac_status=$? 12711 ac_status=$?
@@ -12726,15 +12715,14 @@ if test -n "$GNUTLS_LIBS"; then
12726else 12715else
12727 pkg_failed=yes 12716 pkg_failed=yes
12728fi 12717fi
12729 else 12718 fi
12730 pkg_failed=untried 12719else
12720 pkg_failed=untried
12731fi 12721fi
12732 12722
12733 12723
12734 12724
12735if test $pkg_failed = yes; then 12725if test $pkg_failed = yes; then
12736 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12737$as_echo "no" >&6; }
12738 12726
12739if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12727if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12740 _pkg_short_errors_supported=yes 12728 _pkg_short_errors_supported=yes
@@ -12742,17 +12730,17 @@ else
12742 _pkg_short_errors_supported=no 12730 _pkg_short_errors_supported=no
12743fi 12731fi
12744 if test $_pkg_short_errors_supported = yes; then 12732 if test $_pkg_short_errors_supported = yes; then
12745 GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 1.7.6" 2>&1` 12733 GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 1.7.6"`
12746 else 12734 else
12747 GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 1.7.6" 2>&1` 12735 GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 1.7.6"`
12748 fi 12736 fi
12749 # Put the nasty error message in config.log where it belongs 12737 # Put the nasty error message in config.log where it belongs
12750 echo "$GNUTLS_PKG_ERRORS" >&5 12738 echo "$GNUTLS_PKG_ERRORS" >&5
12751 12739
12752 have_gnutls="no" 12740 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12753elif test $pkg_failed = untried; then
12754 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12755$as_echo "no" >&6; } 12741$as_echo "no" >&6; }
12742 have_gnutls="no"
12743elif test $pkg_failed = untried; then
12756 have_gnutls="no" 12744 have_gnutls="no"
12757else 12745else
12758 GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS 12746 GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
@@ -12889,10 +12877,11 @@ pkg_failed=no
12889{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5 12877{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
12890$as_echo_n "checking for OPENSSL... " >&6; } 12878$as_echo_n "checking for OPENSSL... " >&6; }
12891 12879
12892if test -n "$OPENSSL_CFLAGS"; then 12880if test -n "$PKG_CONFIG"; then
12893 pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" 12881 if test -n "$OPENSSL_CFLAGS"; then
12894 elif test -n "$PKG_CONFIG"; then 12882 pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
12895 if test -n "$PKG_CONFIG" && \ 12883 else
12884 if test -n "$PKG_CONFIG" && \
12896 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 12885 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
12897 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 12886 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
12898 ac_status=$? 12887 ac_status=$?
@@ -12902,13 +12891,15 @@ if test -n "$OPENSSL_CFLAGS"; then
12902else 12891else
12903 pkg_failed=yes 12892 pkg_failed=yes
12904fi 12893fi
12905 else 12894 fi
12906 pkg_failed=untried 12895else
12896 pkg_failed=untried
12907fi 12897fi
12908if test -n "$OPENSSL_LIBS"; then 12898if test -n "$PKG_CONFIG"; then
12909 pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" 12899 if test -n "$OPENSSL_LIBS"; then
12910 elif test -n "$PKG_CONFIG"; then 12900 pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
12911 if test -n "$PKG_CONFIG" && \ 12901 else
12902 if test -n "$PKG_CONFIG" && \
12912 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 12903 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
12913 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 12904 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
12914 ac_status=$? 12905 ac_status=$?
@@ -12918,15 +12909,14 @@ if test -n "$OPENSSL_LIBS"; then
12918else 12909else
12919 pkg_failed=yes 12910 pkg_failed=yes
12920fi 12911fi
12921 else 12912 fi
12922 pkg_failed=untried 12913else
12914 pkg_failed=untried
12923fi 12915fi
12924 12916
12925 12917
12926 12918
12927if test $pkg_failed = yes; then 12919if test $pkg_failed = yes; then
12928 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12929$as_echo "no" >&6; }
12930 12920
12931if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12921if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12932 _pkg_short_errors_supported=yes 12922 _pkg_short_errors_supported=yes
@@ -12934,17 +12924,17 @@ else
12934 _pkg_short_errors_supported=no 12924 _pkg_short_errors_supported=no
12935fi 12925fi
12936 if test $_pkg_short_errors_supported = yes; then 12926 if test $_pkg_short_errors_supported = yes; then
12937 OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1` 12927 OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
12938 else 12928 else
12939 OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1` 12929 OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
12940 fi 12930 fi
12941 # Put the nasty error message in config.log where it belongs 12931 # Put the nasty error message in config.log where it belongs
12942 echo "$OPENSSL_PKG_ERRORS" >&5 12932 echo "$OPENSSL_PKG_ERRORS" >&5
12943 12933
12944 have_openssl="no" 12934 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12945elif test $pkg_failed = untried; then
12946 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12947$as_echo "no" >&6; } 12935$as_echo "no" >&6; }
12936 have_openssl="no"
12937elif test $pkg_failed = untried; then
12948 have_openssl="no" 12938 have_openssl="no"
12949else 12939else
12950 OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS 12940 OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
@@ -13011,7 +13001,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_inclu
13011if test "x$ac_cv_header_zlib_h" = x""yes; then : 13001if test "x$ac_cv_header_zlib_h" = x""yes; then :
13012 dummy="yes" 13002 dummy="yes"
13013else 13003else
13014 as_fn_error $? "\"Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file\"" "$LINENO" 5 13004 as_fn_error "\"Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file\"" "$LINENO" 5
13015fi 13005fi
13016 13006
13017 13007
@@ -13020,7 +13010,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac
13020if test "x$ac_cv_header_jpeglib_h" = x""yes; then : 13010if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
13021 dummy="yes" 13011 dummy="yes"
13022else 13012else
13023 as_fn_error $? "\"Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file\"" "$LINENO" 5 13013 as_fn_error "\"Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file\"" "$LINENO" 5
13024fi 13014fi
13025 13015
13026 13016
@@ -13029,7 +13019,8 @@ for ac_header in netinet/in.h unistd.h
13029do : 13019do :
13030 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 13020 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
13031ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 13021ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
13032if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 13022eval as_val=\$$as_ac_Header
13023 if test "x$as_val" = x""yes; then :
13033 cat >>confdefs.h <<_ACEOF 13024 cat >>confdefs.h <<_ACEOF
13034#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 13025#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
13035_ACEOF 13026_ACEOF
@@ -13106,7 +13097,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
13106fi 13097fi
13107set dummy $CC; ac_cc=`$as_echo "$2" | 13098set dummy $CC; ac_cc=`$as_echo "$2" |
13108 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` 13099 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
13109if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : 13100if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
13110 $as_echo_n "(cached) " >&6 13101 $as_echo_n "(cached) " >&6
13111else 13102else
13112 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13103 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14001,7 +13992,8 @@ if test $ac_cv_os_cray = yes; then
14001 for ac_func in _getb67 GETB67 getb67; do 13992 for ac_func in _getb67 GETB67 getb67; do
14002 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 13993 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
14003ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 13994ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
14004if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 13995eval as_val=\$$as_ac_var
13996 if test "x$as_val" = x""yes; then :
14005 13997
14006cat >>confdefs.h <<_ACEOF 13998cat >>confdefs.h <<_ACEOF
14007#define CRAY_STACKSEG_END $ac_func 13999#define CRAY_STACKSEG_END $ac_func
@@ -14068,7 +14060,8 @@ for ac_func in fmemopen open_memstream realpath
14068do : 14060do :
14069 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 14061 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
14070ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 14062ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
14071if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 14063eval as_val=\$$as_ac_var
14064 if test "x$as_val" = x""yes; then :
14072 cat >>confdefs.h <<_ACEOF 14065 cat >>confdefs.h <<_ACEOF
14073#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 14066#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
14074_ACEOF 14067_ACEOF
@@ -14160,7 +14153,7 @@ fi
14160if test "x$_efl_have_fnmatch" = "xyes"; then : 14153if test "x$_efl_have_fnmatch" = "xyes"; then :
14161 14154
14162else 14155else
14163 as_fn_error $? "Cannot find fnmatch()" "$LINENO" 5 14156 as_fn_error "Cannot find fnmatch()" "$LINENO" 5
14164fi 14157fi
14165 14158
14166 14159
@@ -14253,7 +14246,6 @@ DEFS=-DHAVE_CONFIG_H
14253 14246
14254ac_libobjs= 14247ac_libobjs=
14255ac_ltlibobjs= 14248ac_ltlibobjs=
14256U=
14257for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 14249for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
14258 # 1. Remove the extension, and $U if already installed. 14250 # 1. Remove the extension, and $U if already installed.
14259 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 14251 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -14277,43 +14269,43 @@ else
14277fi 14269fi
14278 14270
14279if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then 14271if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
14280 as_fn_error $? "conditional \"AMDEP\" was never defined. 14272 as_fn_error "conditional \"AMDEP\" was never defined.
14281Usually this means the macro was only invoked conditionally." "$LINENO" 5 14273Usually this means the macro was only invoked conditionally." "$LINENO" 5
14282fi 14274fi
14283if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 14275if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
14284 as_fn_error $? "conditional \"am__fastdepCC\" was never defined. 14276 as_fn_error "conditional \"am__fastdepCC\" was never defined.
14285Usually this means the macro was only invoked conditionally." "$LINENO" 5 14277Usually this means the macro was only invoked conditionally." "$LINENO" 5
14286fi 14278fi
14287if test -z "${EET_AMALGAMATION_TRUE}" && test -z "${EET_AMALGAMATION_FALSE}"; then 14279if test -z "${EET_AMALGAMATION_TRUE}" && test -z "${EET_AMALGAMATION_FALSE}"; then
14288 as_fn_error $? "conditional \"EET_AMALGAMATION\" was never defined. 14280 as_fn_error "conditional \"EET_AMALGAMATION\" was never defined.
14289Usually this means the macro was only invoked conditionally." "$LINENO" 5 14281Usually this means the macro was only invoked conditionally." "$LINENO" 5
14290fi 14282fi
14291if test -z "${BUILD_EET_TRUE}" && test -z "${BUILD_EET_FALSE}"; then 14283if test -z "${BUILD_EET_TRUE}" && test -z "${BUILD_EET_FALSE}"; then
14292 as_fn_error $? "conditional \"BUILD_EET\" was never defined. 14284 as_fn_error "conditional \"BUILD_EET\" was never defined.
14293Usually this means the macro was only invoked conditionally." "$LINENO" 5 14285Usually this means the macro was only invoked conditionally." "$LINENO" 5
14294fi 14286fi
14295if test -z "${INSTALL_EXAMPLES_TRUE}" && test -z "${INSTALL_EXAMPLES_FALSE}"; then 14287if test -z "${INSTALL_EXAMPLES_TRUE}" && test -z "${INSTALL_EXAMPLES_FALSE}"; then
14296 as_fn_error $? "conditional \"INSTALL_EXAMPLES\" was never defined. 14288 as_fn_error "conditional \"INSTALL_EXAMPLES\" was never defined.
14297Usually this means the macro was only invoked conditionally." "$LINENO" 5 14289Usually this means the macro was only invoked conditionally." "$LINENO" 5
14298fi 14290fi
14299if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then 14291if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then
14300 as_fn_error $? "conditional \"BUILD_EXAMPLES\" was never defined. 14292 as_fn_error "conditional \"BUILD_EXAMPLES\" was never defined.
14301Usually this means the macro was only invoked conditionally." "$LINENO" 5 14293Usually this means the macro was only invoked conditionally." "$LINENO" 5
14302fi 14294fi
14303if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then 14295if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then
14304 as_fn_error $? "conditional \"EFL_ENABLE_TESTS\" was never defined. 14296 as_fn_error "conditional \"EFL_ENABLE_TESTS\" was never defined.
14305Usually this means the macro was only invoked conditionally." "$LINENO" 5 14297Usually this means the macro was only invoked conditionally." "$LINENO" 5
14306fi 14298fi
14307if test -z "${EFL_ENABLE_COVERAGE_TRUE}" && test -z "${EFL_ENABLE_COVERAGE_FALSE}"; then 14299if test -z "${EFL_ENABLE_COVERAGE_TRUE}" && test -z "${EFL_ENABLE_COVERAGE_FALSE}"; then
14308 as_fn_error $? "conditional \"EFL_ENABLE_COVERAGE\" was never defined. 14300 as_fn_error "conditional \"EFL_ENABLE_COVERAGE\" was never defined.
14309Usually this means the macro was only invoked conditionally." "$LINENO" 5 14301Usually this means the macro was only invoked conditionally." "$LINENO" 5
14310fi 14302fi
14311if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 14303if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
14312 as_fn_error $? "conditional \"am__fastdepCC\" was never defined. 14304 as_fn_error "conditional \"am__fastdepCC\" was never defined.
14313Usually this means the macro was only invoked conditionally." "$LINENO" 5 14305Usually this means the macro was only invoked conditionally." "$LINENO" 5
14314fi 14306fi
14315if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then 14307if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then
14316 as_fn_error $? "conditional \"EFL_BUILD_DOC\" was never defined. 14308 as_fn_error "conditional \"EFL_BUILD_DOC\" was never defined.
14317Usually this means the macro was only invoked conditionally." "$LINENO" 5 14309Usually this means the macro was only invoked conditionally." "$LINENO" 5
14318fi 14310fi
14319 14311
@@ -14463,19 +14455,19 @@ export LANGUAGE
14463(unset CDPATH) >/dev/null 2>&1 && unset CDPATH 14455(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
14464 14456
14465 14457
14466# as_fn_error STATUS ERROR [LINENO LOG_FD] 14458# as_fn_error ERROR [LINENO LOG_FD]
14467# ---------------------------------------- 14459# ---------------------------------
14468# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 14460# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
14469# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 14461# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
14470# script with STATUS, using 1 if that was 0. 14462# script with status $?, using 1 if that was 0.
14471as_fn_error () 14463as_fn_error ()
14472{ 14464{
14473 as_status=$1; test $as_status -eq 0 && as_status=1 14465 as_status=$?; test $as_status -eq 0 && as_status=1
14474 if test "$4"; then 14466 if test "$3"; then
14475 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 14467 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
14476 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 14468 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
14477 fi 14469 fi
14478 $as_echo "$as_me: error: $2" >&2 14470 $as_echo "$as_me: error: $1" >&2
14479 as_fn_exit $as_status 14471 as_fn_exit $as_status
14480} # as_fn_error 14472} # as_fn_error
14481 14473
@@ -14671,7 +14663,7 @@ $as_echo X"$as_dir" |
14671 test -d "$as_dir" && break 14663 test -d "$as_dir" && break
14672 done 14664 done
14673 test -z "$as_dirs" || eval "mkdir $as_dirs" 14665 test -z "$as_dirs" || eval "mkdir $as_dirs"
14674 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 14666 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
14675 14667
14676 14668
14677} # as_fn_mkdir_p 14669} # as_fn_mkdir_p
@@ -14724,8 +14716,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
14724# report actual input values of CONFIG_FILES etc. instead of their 14716# report actual input values of CONFIG_FILES etc. instead of their
14725# values after options handling. 14717# values after options handling.
14726ac_log=" 14718ac_log="
14727This file was extended by eet $as_me 1.5.0, which was 14719This file was extended by eet $as_me 1.5.99.67344, which was
14728generated by GNU Autoconf 2.67. Invocation command line was 14720generated by GNU Autoconf 2.65. Invocation command line was
14729 14721
14730 CONFIG_FILES = $CONFIG_FILES 14722 CONFIG_FILES = $CONFIG_FILES
14731 CONFIG_HEADERS = $CONFIG_HEADERS 14723 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -14790,11 +14782,11 @@ _ACEOF
14790cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 14782cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14791ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 14783ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14792ac_cs_version="\\ 14784ac_cs_version="\\
14793eet config.status 1.5.0 14785eet config.status 1.5.99.67344
14794configured by $0, generated by GNU Autoconf 2.67, 14786configured by $0, generated by GNU Autoconf 2.65,
14795 with options \\"\$ac_cs_config\\" 14787 with options \\"\$ac_cs_config\\"
14796 14788
14797Copyright (C) 2010 Free Software Foundation, Inc. 14789Copyright (C) 2009 Free Software Foundation, Inc.
14798This config.status script is free software; the Free Software Foundation 14790This config.status script is free software; the Free Software Foundation
14799gives unlimited permission to copy, distribute and modify it." 14791gives unlimited permission to copy, distribute and modify it."
14800 14792
@@ -14812,16 +14804,11 @@ ac_need_defaults=:
14812while test $# != 0 14804while test $# != 0
14813do 14805do
14814 case $1 in 14806 case $1 in
14815 --*=?*) 14807 --*=*)
14816 ac_option=`expr "X$1" : 'X\([^=]*\)='` 14808 ac_option=`expr "X$1" : 'X\([^=]*\)='`
14817 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 14809 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
14818 ac_shift=: 14810 ac_shift=:
14819 ;; 14811 ;;
14820 --*=)
14821 ac_option=`expr "X$1" : 'X\([^=]*\)='`
14822 ac_optarg=
14823 ac_shift=:
14824 ;;
14825 *) 14812 *)
14826 ac_option=$1 14813 ac_option=$1
14827 ac_optarg=$2 14814 ac_optarg=$2
@@ -14843,7 +14830,6 @@ do
14843 $ac_shift 14830 $ac_shift
14844 case $ac_optarg in 14831 case $ac_optarg in
14845 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 14832 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
14846 '') as_fn_error $? "missing file argument" ;;
14847 esac 14833 esac
14848 as_fn_append CONFIG_FILES " '$ac_optarg'" 14834 as_fn_append CONFIG_FILES " '$ac_optarg'"
14849 ac_need_defaults=false;; 14835 ac_need_defaults=false;;
@@ -14856,7 +14842,7 @@ do
14856 ac_need_defaults=false;; 14842 ac_need_defaults=false;;
14857 --he | --h) 14843 --he | --h)
14858 # Conflict between --help and --header 14844 # Conflict between --help and --header
14859 as_fn_error $? "ambiguous option: \`$1' 14845 as_fn_error "ambiguous option: \`$1'
14860Try \`$0 --help' for more information.";; 14846Try \`$0 --help' for more information.";;
14861 --help | --hel | -h ) 14847 --help | --hel | -h )
14862 $as_echo "$ac_cs_usage"; exit ;; 14848 $as_echo "$ac_cs_usage"; exit ;;
@@ -14865,7 +14851,7 @@ Try \`$0 --help' for more information.";;
14865 ac_cs_silent=: ;; 14851 ac_cs_silent=: ;;
14866 14852
14867 # This is an error. 14853 # This is an error.
14868 -*) as_fn_error $? "unrecognized option: \`$1' 14854 -*) as_fn_error "unrecognized option: \`$1'
14869Try \`$0 --help' for more information." ;; 14855Try \`$0 --help' for more information." ;;
14870 14856
14871 *) as_fn_append ac_config_targets " $1" 14857 *) as_fn_append ac_config_targets " $1"
@@ -15190,7 +15176,7 @@ do
15190 "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;; 15176 "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
15191 "eet.spec") CONFIG_FILES="$CONFIG_FILES eet.spec" ;; 15177 "eet.spec") CONFIG_FILES="$CONFIG_FILES eet.spec" ;;
15192 15178
15193 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 15179 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
15194 esac 15180 esac
15195done 15181done
15196 15182
@@ -15228,7 +15214,7 @@ $debug ||
15228{ 15214{
15229 tmp=./conf$$-$RANDOM 15215 tmp=./conf$$-$RANDOM
15230 (umask 077 && mkdir "$tmp") 15216 (umask 077 && mkdir "$tmp")
15231} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 15217} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
15232 15218
15233# Set up the scripts for CONFIG_FILES section. 15219# Set up the scripts for CONFIG_FILES section.
15234# No need to generate them if there are no CONFIG_FILES. 15220# No need to generate them if there are no CONFIG_FILES.
@@ -15245,7 +15231,7 @@ if test "x$ac_cr" = x; then
15245fi 15231fi
15246ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 15232ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
15247if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 15233if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
15248 ac_cs_awk_cr='\\r' 15234 ac_cs_awk_cr='\r'
15249else 15235else
15250 ac_cs_awk_cr=$ac_cr 15236 ac_cs_awk_cr=$ac_cr
15251fi 15237fi
@@ -15259,18 +15245,18 @@ _ACEOF
15259 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 15245 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
15260 echo "_ACEOF" 15246 echo "_ACEOF"
15261} >conf$$subs.sh || 15247} >conf$$subs.sh ||
15262 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 15248 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
15263ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` 15249ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
15264ac_delim='%!_!# ' 15250ac_delim='%!_!# '
15265for ac_last_try in false false false false false :; do 15251for ac_last_try in false false false false false :; do
15266 . ./conf$$subs.sh || 15252 . ./conf$$subs.sh ||
15267 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 15253 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
15268 15254
15269 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 15255 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
15270 if test $ac_delim_n = $ac_delim_num; then 15256 if test $ac_delim_n = $ac_delim_num; then
15271 break 15257 break
15272 elif $ac_last_try; then 15258 elif $ac_last_try; then
15273 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 15259 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
15274 else 15260 else
15275 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 15261 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
15276 fi 15262 fi
@@ -15359,28 +15345,20 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
15359else 15345else
15360 cat 15346 cat
15361fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 15347fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
15362 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 15348 || as_fn_error "could not setup config files machinery" "$LINENO" 5
15363_ACEOF 15349_ACEOF
15364 15350
15365# VPATH may cause trouble with some makes, so we remove sole $(srcdir), 15351# VPATH may cause trouble with some makes, so we remove $(srcdir),
15366# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and 15352# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
15367# trailing colons and then remove the whole line if VPATH becomes empty 15353# trailing colons and then remove the whole line if VPATH becomes empty
15368# (actually we leave an empty line to preserve line numbers). 15354# (actually we leave an empty line to preserve line numbers).
15369if test "x$srcdir" = x.; then 15355if test "x$srcdir" = x.; then
15370 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 15356 ac_vpsub='/^[ ]*VPATH[ ]*=/{
15371h 15357s/:*\$(srcdir):*/:/
15372s/// 15358s/:*\${srcdir}:*/:/
15373s/^/:/ 15359s/:*@srcdir@:*/:/
15374s/[ ]*$/:/ 15360s/^\([^=]*=[ ]*\):*/\1/
15375s/:\$(srcdir):/:/g
15376s/:\${srcdir}:/:/g
15377s/:@srcdir@:/:/g
15378s/^:*//
15379s/:*$// 15361s/:*$//
15380x
15381s/\(=[ ]*\).*/\1/
15382G
15383s/\n//
15384s/^[^=]*=[ ]*$// 15362s/^[^=]*=[ ]*$//
15385}' 15363}'
15386fi 15364fi
@@ -15408,7 +15386,7 @@ for ac_last_try in false false :; do
15408 if test -z "$ac_t"; then 15386 if test -z "$ac_t"; then
15409 break 15387 break
15410 elif $ac_last_try; then 15388 elif $ac_last_try; then
15411 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 15389 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
15412 else 15390 else
15413 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 15391 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
15414 fi 15392 fi
@@ -15493,7 +15471,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15493_ACAWK 15471_ACAWK
15494_ACEOF 15472_ACEOF
15495cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 15473cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
15496 as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 15474 as_fn_error "could not setup config headers machinery" "$LINENO" 5
15497fi # test -n "$CONFIG_HEADERS" 15475fi # test -n "$CONFIG_HEADERS"
15498 15476
15499 15477
@@ -15506,7 +15484,7 @@ do
15506 esac 15484 esac
15507 case $ac_mode$ac_tag in 15485 case $ac_mode$ac_tag in
15508 :[FHL]*:*);; 15486 :[FHL]*:*);;
15509 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 15487 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
15510 :[FH]-) ac_tag=-:-;; 15488 :[FH]-) ac_tag=-:-;;
15511 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 15489 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
15512 esac 15490 esac
@@ -15534,7 +15512,7 @@ do
15534 [\\/$]*) false;; 15512 [\\/$]*) false;;
15535 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 15513 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
15536 esac || 15514 esac ||
15537 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 15515 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
15538 esac 15516 esac
15539 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 15517 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
15540 as_fn_append ac_file_inputs " '$ac_f'" 15518 as_fn_append ac_file_inputs " '$ac_f'"
@@ -15561,7 +15539,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
15561 15539
15562 case $ac_tag in 15540 case $ac_tag in
15563 *:-:* | *:-) cat >"$tmp/stdin" \ 15541 *:-:* | *:-) cat >"$tmp/stdin" \
15564 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 15542 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
15565 esac 15543 esac
15566 ;; 15544 ;;
15567 esac 15545 esac
@@ -15698,22 +15676,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
15698$ac_datarootdir_hack 15676$ac_datarootdir_hack
15699" 15677"
15700eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 15678eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
15701 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 15679 || as_fn_error "could not create $ac_file" "$LINENO" 5
15702 15680
15703test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 15681test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
15704 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 15682 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
15705 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 15683 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
15706 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 15684 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
15707which seems to be undefined. Please make sure it is defined" >&5 15685which seems to be undefined. Please make sure it is defined." >&5
15708$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 15686$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
15709which seems to be undefined. Please make sure it is defined" >&2;} 15687which seems to be undefined. Please make sure it is defined." >&2;}
15710 15688
15711 rm -f "$tmp/stdin" 15689 rm -f "$tmp/stdin"
15712 case $ac_file in 15690 case $ac_file in
15713 -) cat "$tmp/out" && rm -f "$tmp/out";; 15691 -) cat "$tmp/out" && rm -f "$tmp/out";;
15714 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 15692 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
15715 esac \ 15693 esac \
15716 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 15694 || as_fn_error "could not create $ac_file" "$LINENO" 5
15717 ;; 15695 ;;
15718 :H) 15696 :H)
15719 # 15697 #
@@ -15724,19 +15702,19 @@ which seems to be undefined. Please make sure it is defined" >&2;}
15724 $as_echo "/* $configure_input */" \ 15702 $as_echo "/* $configure_input */" \
15725 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 15703 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
15726 } >"$tmp/config.h" \ 15704 } >"$tmp/config.h" \
15727 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 15705 || as_fn_error "could not create $ac_file" "$LINENO" 5
15728 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 15706 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
15729 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 15707 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
15730$as_echo "$as_me: $ac_file is unchanged" >&6;} 15708$as_echo "$as_me: $ac_file is unchanged" >&6;}
15731 else 15709 else
15732 rm -f "$ac_file" 15710 rm -f "$ac_file"
15733 mv "$tmp/config.h" "$ac_file" \ 15711 mv "$tmp/config.h" "$ac_file" \
15734 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 15712 || as_fn_error "could not create $ac_file" "$LINENO" 5
15735 fi 15713 fi
15736 else 15714 else
15737 $as_echo "/* $configure_input */" \ 15715 $as_echo "/* $configure_input */" \
15738 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 15716 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
15739 || as_fn_error $? "could not create -" "$LINENO" 5 15717 || as_fn_error "could not create -" "$LINENO" 5
15740 fi 15718 fi
15741# Compute "$ac_file"'s index in $config_headers. 15719# Compute "$ac_file"'s index in $config_headers.
15742_am_arg="$ac_file" 15720_am_arg="$ac_file"
@@ -16527,7 +16505,7 @@ _ACEOF
16527ac_clean_files=$ac_clean_files_save 16505ac_clean_files=$ac_clean_files_save
16528 16506
16529test $ac_write_fail = 0 || 16507test $ac_write_fail = 0 ||
16530 as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 16508 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
16531 16509
16532 16510
16533# configure is writing to config.log, and then calls config.status. 16511# configure is writing to config.log, and then calls config.status.
@@ -16548,7 +16526,7 @@ if test "$no_create" != yes; then
16548 exec 5>>config.log 16526 exec 5>>config.log
16549 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 16527 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
16550 # would make configure fail if this is the last instruction. 16528 # would make configure fail if this is the last instruction.
16551 $ac_cs_success || as_fn_exit 1 16529 $ac_cs_success || as_fn_exit $?
16552fi 16530fi
16553if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 16531if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
16554 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 16532 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/libraries/eet/configure.ac b/libraries/eet/configure.ac
index 984cd75..220e2a1 100644
--- a/libraries/eet/configure.ac
+++ b/libraries/eet/configure.ac
@@ -2,11 +2,11 @@ y##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [5]) 4m4_define([v_min], [5])
5m4_define([v_mic], [0]) 5m4_define([v_mic], [99])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9m4_undefine([v_rev]) 9dnl m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11dnl m4_define([relname], [ver-pre-svn-05]) 11dnl m4_define([relname], [ver-pre-svn-05])
12dnl m4_define([v_rel], [-release relname]) 12dnl m4_define([v_rel], [-release relname])
diff --git a/libraries/eet/doc/Doxyfile b/libraries/eet/doc/Doxyfile
index bf2352b..f6e3026 100644
--- a/libraries/eet/doc/Doxyfile
+++ b/libraries/eet/doc/Doxyfile
@@ -1,139 +1,1694 @@
1# Doxyfile 1.7.3
2
3# This file describes the settings to be used by the documentation system
4# doxygen (www.doxygen.org) for a project.
5#
6# All text after a hash (#) is considered a comment and will be ignored.
7# The format is:
8# TAG = value [value, ...]
9# For lists items can also be appended using:
10# TAG += value [value, ...]
11# Values that contain spaces should be placed between quotes (" ").
12
13#---------------------------------------------------------------------------
14# Project related configuration options
15#---------------------------------------------------------------------------
16
17# This tag specifies the encoding used for all characters in the config file
18# that follow. The default is UTF-8 which is also the encoding used for all
19# text before the first occurrence of this tag. Doxygen uses libiconv (or the
20# iconv built into libc) for the transcoding. See
21# http://www.gnu.org/software/libiconv for the list of possible encodings.
22
23DOXYFILE_ENCODING = UTF-8
24
25# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
26# by quotes) that should identify the project.
27
1PROJECT_NAME = Eet 28PROJECT_NAME = Eet
2PROJECT_NUMBER = 1.5.0 29
30# The PROJECT_NUMBER tag can be used to enter a project or revision number.
31# This could be handy for archiving the generated documentation or
32# if some version control system is used.
33
34PROJECT_NUMBER = 1.5.99.67344
35
36# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
37
38PROJECT_BRIEF =
39
40# With the PROJECT_LOGO tag one can specify an logo or icon that is
41# included in the documentation. The maximum height of the logo should not
42# exceed 55 pixels and the maximum width should not exceed 200 pixels.
43# Doxygen will copy the logo to the output directory.
44
45PROJECT_LOGO =
46
47# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
48# base path where the generated documentation will be put.
49# If a relative path is entered, it will be relative to the location
50# where doxygen was started. If left blank the current directory will be used.
51
3OUTPUT_DIRECTORY = . 52OUTPUT_DIRECTORY = .
4INPUT = ./eet.dox ./examples.dox ../src/lib 53
5IMAGE_PATH = img 54# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
55# 4096 sub-directories (in 2 levels) under the output directory of each output
56# format and will distribute the generated files over these directories.
57# Enabling this option can be useful when feeding doxygen a huge amount of
58# source files, where putting all generated files in the same directory would
59# otherwise cause performance problems for the file system.
60
61CREATE_SUBDIRS = NO
62
63# The OUTPUT_LANGUAGE tag is used to specify the language in which all
64# documentation generated by doxygen is written. Doxygen will use this
65# information to generate all constant output in the proper language.
66# The default language is English, other supported languages are:
67# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
68# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
69# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
70# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
71# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
72# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
73
6OUTPUT_LANGUAGE = English 74OUTPUT_LANGUAGE = English
7GENERATE_HTML = YES 75
8HTML_OUTPUT = html 76# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
9HTML_FILE_EXTENSION = .html 77# include brief member descriptions after the members that are listed in
10HTML_HEADER = ./head.html 78# the file and class documentation (similar to JavaDoc).
11HTML_FOOTER = ./foot.html 79# Set to NO to disable this.
12HTML_STYLESHEET = ./e.css 80
13HTML_ALIGN_MEMBERS = YES
14ENUM_VALUES_PER_LINE = 1
15GENERATE_HTMLHELP = NO
16CHM_FILE =
17HHC_LOCATION =
18GENERATE_CHI = NO
19BINARY_TOC = NO
20TOC_EXPAND = NO
21DISABLE_INDEX = YES
22EXTRACT_ALL = NO
23EXTRACT_PRIVATE = NO
24EXTRACT_STATIC = NO
25EXTRACT_LOCAL_CLASSES = NO
26HIDE_UNDOC_MEMBERS = YES
27HIDE_UNDOC_CLASSES = YES
28HIDE_FRIEND_COMPOUNDS = YES
29BRIEF_MEMBER_DESC = YES 81BRIEF_MEMBER_DESC = YES
82
83# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
84# the brief description of a member or function before the detailed description.
85# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
86# brief descriptions will be completely suppressed.
87
30REPEAT_BRIEF = YES 88REPEAT_BRIEF = YES
89
90# This tag implements a quasi-intelligent brief description abbreviator
91# that is used to form the text in various listings. Each string
92# in this list, if found as the leading text of the brief description, will be
93# stripped from the text and the result after processing the whole list, is
94# used as the annotated text. Otherwise, the brief description is used as-is.
95# If left blank, the following values are used ("$name" is automatically
96# replaced with the name of the entity): "The $name class" "The $name widget"
97# "The $name file" "is" "provides" "specifies" "contains"
98# "represents" "a" "an" "the"
99
100ABBREVIATE_BRIEF =
101
102# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
103# Doxygen will generate a detailed section even if there is only a brief
104# description.
105
31ALWAYS_DETAILED_SEC = NO 106ALWAYS_DETAILED_SEC = NO
107
108# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
109# inherited members of a class in the documentation of that class as if those
110# members were ordinary class members. Constructors, destructors and assignment
111# operators of the base classes will not be shown.
112
32INLINE_INHERITED_MEMB = NO 113INLINE_INHERITED_MEMB = NO
114
115# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
116# path before files name in the file list and in the header files. If set
117# to NO the shortest path that makes the file name unique will be used.
118
33FULL_PATH_NAMES = NO 119FULL_PATH_NAMES = NO
34STRIP_FROM_PATH = 120
35INTERNAL_DOCS = NO 121# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
36STRIP_CODE_COMMENTS = NO 122# can be used to strip a user-defined part of the path. Stripping is
37CASE_SENSE_NAMES = YES 123# only done if one of the specified strings matches the left-hand part of
124# the path. The tag can be used to show relative paths in the file list.
125# If left blank the directory from which doxygen is run is used as the
126# path to strip.
127
128STRIP_FROM_PATH =
129
130# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
131# the path mentioned in the documentation of a class, which tells
132# the reader which header file to include in order to use a class.
133# If left blank only the name of the header file containing the class
134# definition is used. Otherwise one should specify the include paths that
135# are normally passed to the compiler using the -I flag.
136
137STRIP_FROM_INC_PATH =
138
139# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
140# (but less readable) file names. This can be useful if your file system
141# doesn't support long names like on DOS, Mac, or CD-ROM.
142
38SHORT_NAMES = NO 143SHORT_NAMES = NO
39HIDE_SCOPE_NAMES = NO 144
40VERBATIM_HEADERS = NO 145# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
41SHOW_INCLUDE_FILES = NO 146# will interpret the first line (until the first dot) of a JavaDoc-style
147# comment as the brief description. If set to NO, the JavaDoc
148# comments will behave just like regular Qt-style comments
149# (thus requiring an explicit @brief command for a brief description.)
150
42JAVADOC_AUTOBRIEF = YES 151JAVADOC_AUTOBRIEF = YES
152
153# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
154# interpret the first line (until the first dot) of a Qt-style
155# comment as the brief description. If set to NO, the comments
156# will behave just like regular Qt-style comments (thus requiring
157# an explicit \brief command for a brief description.)
158
159QT_AUTOBRIEF = NO
160
161# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
162# treat a multi-line C++ special comment block (i.e. a block of //! or ///
163# comments) as a brief description. This used to be the default behaviour.
164# The new default is to treat a multi-line C++ comment block as a detailed
165# description. Set this tag to YES if you prefer the old behaviour instead.
166
43MULTILINE_CPP_IS_BRIEF = NO 167MULTILINE_CPP_IS_BRIEF = NO
44DETAILS_AT_TOP = NO 168
169# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
170# member inherits the documentation from any documented member that it
171# re-implements.
172
45INHERIT_DOCS = YES 173INHERIT_DOCS = YES
46INLINE_INFO = YES 174
47SORT_MEMBER_DOCS = YES 175# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
48DISTRIBUTE_GROUP_DOC = NO 176# a new page for each member. If set to NO, the documentation of a member will
177# be part of the file/class/namespace that contains it.
178
179SEPARATE_MEMBER_PAGES = NO
180
181# The TAB_SIZE tag can be used to set the number of spaces in a tab.
182# Doxygen uses this value to replace tabs by spaces in code fragments.
183
49TAB_SIZE = 8 184TAB_SIZE = 8
185
186# This tag can be used to specify a number of aliases that acts
187# as commands in the documentation. An alias has the form "name=value".
188# For example adding "sideeffect=\par Side Effects:\n" will allow you to
189# put the command \sideeffect (or @sideeffect) in the documentation, which
190# will result in a user-defined paragraph with heading "Side Effects:".
191# You can put \n's in the value part of an alias to insert newlines.
192
193ALIASES =
194
195# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
196# sources only. Doxygen will then generate output that is more tailored for C.
197# For instance, some of the names that are used will be different. The list
198# of all members will be omitted, etc.
199
200OPTIMIZE_OUTPUT_FOR_C = YES
201
202# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
203# sources only. Doxygen will then generate output that is more tailored for
204# Java. For instance, namespaces will be presented as packages, qualified
205# scopes will look different, etc.
206
207OPTIMIZE_OUTPUT_JAVA = NO
208
209# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
210# sources only. Doxygen will then generate output that is more tailored for
211# Fortran.
212
213OPTIMIZE_FOR_FORTRAN = NO
214
215# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
216# sources. Doxygen will then generate output that is tailored for
217# VHDL.
218
219OPTIMIZE_OUTPUT_VHDL = NO
220
221# Doxygen selects the parser to use depending on the extension of the files it
222# parses. With this tag you can assign which parser to use for a given extension.
223# Doxygen has a built-in mapping, but you can override or extend it using this
224# tag. The format is ext=language, where ext is a file extension, and language
225# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
226# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
227# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
228# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
229# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
230
231EXTENSION_MAPPING =
232
233# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
234# to include (a tag file for) the STL sources as input, then you should
235# set this tag to YES in order to let doxygen match functions declarations and
236# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
237# func(std::string) {}). This also makes the inheritance and collaboration
238# diagrams that involve STL classes more complete and accurate.
239
240BUILTIN_STL_SUPPORT = NO
241
242# If you use Microsoft's C++/CLI language, you should set this option to YES to
243# enable parsing support.
244
245CPP_CLI_SUPPORT = NO
246
247# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
248# Doxygen will parse them like normal C++ but will assume all classes use public
249# instead of private inheritance when no explicit protection keyword is present.
250
251SIP_SUPPORT = NO
252
253# For Microsoft's IDL there are propget and propput attributes to indicate getter
254# and setter methods for a property. Setting this option to YES (the default)
255# will make doxygen replace the get and set methods by a property in the
256# documentation. This will only work if the methods are indeed getting or
257# setting a simple type. If this is not the case, or you want to show the
258# methods anyway, you should set this option to NO.
259
260IDL_PROPERTY_SUPPORT = YES
261
262# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
263# tag is set to YES, then doxygen will reuse the documentation of the first
264# member in the group (if any) for the other members of the group. By default
265# all members of a group must be documented explicitly.
266
267DISTRIBUTE_GROUP_DOC = NO
268
269# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
270# the same type (for instance a group of public functions) to be put as a
271# subgroup of that type (e.g. under the Public Functions section). Set it to
272# NO to prevent subgrouping. Alternatively, this can be done per class using
273# the \nosubgrouping command.
274
275SUBGROUPING = YES
276
277# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
278# is documented as struct, union, or enum with the name of the typedef. So
279# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
280# with name TypeT. When disabled the typedef will appear as a member of a file,
281# namespace, or class. And the struct will be named TypeS. This can typically
282# be useful for C code in case the coding convention dictates that all compound
283# types are typedef'ed and only the typedef is referenced, never the tag name.
284
285TYPEDEF_HIDES_STRUCT = NO
286
287# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
288# determine which symbols to keep in memory and which to flush to disk.
289# When the cache is full, less often used symbols will be written to disk.
290# For small to medium size projects (<1000 input files) the default value is
291# probably good enough. For larger projects a too small cache size can cause
292# doxygen to be busy swapping symbols to and from disk most of the time
293# causing a significant performance penalty.
294# If the system has enough physical memory increasing the cache will improve the
295# performance by keeping more symbols in memory. Note that the value works on
296# a logarithmic scale so increasing the size by one will roughly double the
297# memory usage. The cache size is given by this formula:
298# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
299# corresponding to a cache size of 2^16 = 65536 symbols
300
301SYMBOL_CACHE_SIZE = 0
302
303#---------------------------------------------------------------------------
304# Build related configuration options
305#---------------------------------------------------------------------------
306
307# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
308# documentation are documented, even if no documentation was available.
309# Private class members and static file members will be hidden unless
310# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
311
312EXTRACT_ALL = NO
313
314# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
315# will be included in the documentation.
316
317EXTRACT_PRIVATE = NO
318
319# If the EXTRACT_STATIC tag is set to YES all static members of a file
320# will be included in the documentation.
321
322EXTRACT_STATIC = NO
323
324# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
325# defined locally in source files will be included in the documentation.
326# If set to NO only classes defined in header files are included.
327
328EXTRACT_LOCAL_CLASSES = NO
329
330# This flag is only useful for Objective-C code. When set to YES local
331# methods, which are defined in the implementation section but not in
332# the interface are included in the documentation.
333# If set to NO (the default) only methods in the interface are included.
334
335EXTRACT_LOCAL_METHODS = NO
336
337# If this flag is set to YES, the members of anonymous namespaces will be
338# extracted and appear in the documentation as a namespace called
339# 'anonymous_namespace{file}', where file will be replaced with the base
340# name of the file that contains the anonymous namespace. By default
341# anonymous namespaces are hidden.
342
343EXTRACT_ANON_NSPACES = NO
344
345# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
346# undocumented members of documented classes, files or namespaces.
347# If set to NO (the default) these members will be included in the
348# various overviews, but no documentation section is generated.
349# This option has no effect if EXTRACT_ALL is enabled.
350
351HIDE_UNDOC_MEMBERS = NO
352
353# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
354# undocumented classes that are normally visible in the class hierarchy.
355# If set to NO (the default) these classes will be included in the various
356# overviews. This option has no effect if EXTRACT_ALL is enabled.
357
358HIDE_UNDOC_CLASSES = NO
359
360# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
361# friend (class|struct|union) declarations.
362# If set to NO (the default) these declarations will be included in the
363# documentation.
364
365HIDE_FRIEND_COMPOUNDS = NO
366
367# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
368# documentation blocks found inside the body of a function.
369# If set to NO (the default) these blocks will be appended to the
370# function's detailed documentation block.
371
372HIDE_IN_BODY_DOCS = NO
373
374# The INTERNAL_DOCS tag determines if documentation
375# that is typed after a \internal command is included. If the tag is set
376# to NO (the default) then the documentation will be excluded.
377# Set it to YES to include the internal documentation.
378
379INTERNAL_DOCS = NO
380
381# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
382# file names in lower-case letters. If set to YES upper-case letters are also
383# allowed. This is useful if you have classes or files whose names only differ
384# in case and if your file system supports case sensitive file names. Windows
385# and Mac users are advised to set this option to NO.
386
387CASE_SENSE_NAMES = YES
388
389# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
390# will show members with their full class and namespace scopes in the
391# documentation. If set to YES the scope will be hidden.
392
393HIDE_SCOPE_NAMES = NO
394
395# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
396# will put a list of the files that are included by a file in the documentation
397# of that file.
398
399SHOW_INCLUDE_FILES = NO
400
401# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
402# will list include files with double quotes in the documentation
403# rather than with sharp brackets.
404
405FORCE_LOCAL_INCLUDES = NO
406
407# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
408# is inserted in the documentation for inline members.
409
410INLINE_INFO = YES
411
412# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
413# will sort the (detailed) documentation of file and class members
414# alphabetically by member name. If set to NO the members will appear in
415# declaration order.
416
417SORT_MEMBER_DOCS = NO
418
419# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
420# brief documentation of file, namespace and class members alphabetically
421# by member name. If set to NO (the default) the members will appear in
422# declaration order.
423
424SORT_BRIEF_DOCS = NO
425
426# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
427# will sort the (brief and detailed) documentation of class members so that
428# constructors and destructors are listed first. If set to NO (the default)
429# the constructors will appear in the respective orders defined by
430# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
431# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
432# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
433
434SORT_MEMBERS_CTORS_1ST = NO
435
436# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
437# hierarchy of group names into alphabetical order. If set to NO (the default)
438# the group names will appear in their defined order.
439
440SORT_GROUP_NAMES = NO
441
442# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
443# sorted by fully-qualified names, including namespaces. If set to
444# NO (the default), the class list will be sorted only by class name,
445# not including the namespace part.
446# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
447# Note: This option applies only to the class list, not to the
448# alphabetical list.
449
450SORT_BY_SCOPE_NAME = NO
451
452# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a
453# match between the prototype and the implementation of a member function even if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
454# will still accept a match between prototype and implementation in such cases.
455
456STRICT_PROTO_MATCHING = NO
457
458# The GENERATE_TODOLIST tag can be used to enable (YES) or
459# disable (NO) the todo list. This list is created by putting \todo
460# commands in the documentation.
461
50GENERATE_TODOLIST = YES 462GENERATE_TODOLIST = YES
463
464# The GENERATE_TESTLIST tag can be used to enable (YES) or
465# disable (NO) the test list. This list is created by putting \test
466# commands in the documentation.
467
51GENERATE_TESTLIST = YES 468GENERATE_TESTLIST = YES
469
470# The GENERATE_BUGLIST tag can be used to enable (YES) or
471# disable (NO) the bug list. This list is created by putting \bug
472# commands in the documentation.
473
52GENERATE_BUGLIST = YES 474GENERATE_BUGLIST = YES
475
476# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
477# disable (NO) the deprecated list. This list is created by putting
478# \deprecated commands in the documentation.
479
53GENERATE_DEPRECATEDLIST= YES 480GENERATE_DEPRECATEDLIST= YES
54ALIASES = 481
55ENABLED_SECTIONS = 482# The ENABLED_SECTIONS tag can be used to enable conditional
483# documentation sections, marked by \if sectionname ... \endif.
484
485ENABLED_SECTIONS =
486
487# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
488# the initial value of a variable or macro consists of for it to appear in
489# the documentation. If the initializer consists of more lines than specified
490# here it will be hidden. Use a value of 0 to hide initializers completely.
491# The appearance of the initializer of individual variables and macros in the
492# documentation can be controlled using \showinitializer or \hideinitializer
493# command in the documentation regardless of this setting.
494
56MAX_INITIALIZER_LINES = 30 495MAX_INITIALIZER_LINES = 30
57OPTIMIZE_OUTPUT_FOR_C = YES 496
58OPTIMIZE_OUTPUT_JAVA = NO 497# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
498# at the bottom of the documentation of classes and structs. If set to YES the
499# list will mention the files that were used to generate the documentation.
500
59SHOW_USED_FILES = NO 501SHOW_USED_FILES = NO
502
503# If the sources in your project are distributed over multiple directories
504# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
505# in the documentation. The default is NO.
506
507SHOW_DIRECTORIES = NO
508
509# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
510# This will remove the Files entry from the Quick Index and from the
511# Folder Tree View (if specified). The default is YES.
512
513SHOW_FILES = YES
514
515# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
516# Namespaces page.
517# This will remove the Namespaces entry from the Quick Index
518# and from the Folder Tree View (if specified). The default is YES.
519
520SHOW_NAMESPACES = YES
521
522# The FILE_VERSION_FILTER tag can be used to specify a program or script that
523# doxygen should invoke to get the current version for each file (typically from
524# the version control system). Doxygen will invoke the program by executing (via
525# popen()) the command <command> <input-file>, where <command> is the value of
526# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
527# provided by doxygen. Whatever the program writes to standard output
528# is used as the file version. See the manual for examples.
529
530FILE_VERSION_FILTER =
531
532# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
533# by doxygen. The layout file controls the global structure of the generated
534# output files in an output format independent way. The create the layout file
535# that represents doxygen's defaults, run doxygen with the -l option.
536# You can optionally specify a file name after the option, if omitted
537# DoxygenLayout.xml will be used as the name of the layout file.
538
539LAYOUT_FILE =
540
541#---------------------------------------------------------------------------
542# configuration options related to warning and progress messages
543#---------------------------------------------------------------------------
544
545# The QUIET tag can be used to turn on/off the messages that are generated
546# by doxygen. Possible values are YES and NO. If left blank NO is used.
547
60QUIET = NO 548QUIET = NO
549
550# The WARNINGS tag can be used to turn on/off the warning messages that are
551# generated by doxygen. Possible values are YES and NO. If left blank
552# NO is used.
553
61WARNINGS = YES 554WARNINGS = YES
555
556# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
557# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
558# automatically be disabled.
559
62WARN_IF_UNDOCUMENTED = YES 560WARN_IF_UNDOCUMENTED = YES
561
562# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
563# potential errors in the documentation, such as not documenting some
564# parameters in a documented function, or documenting parameters that
565# don't exist or using markup commands wrongly.
566
567WARN_IF_DOC_ERROR = YES
568
569# The WARN_NO_PARAMDOC option can be enabled to get warnings for
570# functions that are documented, but have no documentation for their parameters
571# or return value. If set to NO (the default) doxygen will only warn about
572# wrong or incomplete parameter documentation, but not about the absence of
573# documentation.
574
575WARN_NO_PARAMDOC = YES
576
577# The WARN_FORMAT tag determines the format of the warning messages that
578# doxygen can produce. The string should contain the $file, $line, and $text
579# tags, which will be replaced by the file and line number from which the
580# warning originated and the warning text. Optionally the format may contain
581# $version, which will be replaced by the version of the file (if it could
582# be obtained via FILE_VERSION_FILTER)
583
63WARN_FORMAT = "$file:$line: $text" 584WARN_FORMAT = "$file:$line: $text"
64WARN_LOGFILE = 585
65FILE_PATTERNS = 586# The WARN_LOGFILE tag can be used to specify a file to which warning
66RECURSIVE = NO 587# and error messages should be written. If left blank the output is written
67EXCLUDE = 588# to stderr.
589
590WARN_LOGFILE =
591
592#---------------------------------------------------------------------------
593# configuration options related to the input files
594#---------------------------------------------------------------------------
595
596# The INPUT tag can be used to specify the files and/or directories that contain
597# documented source files. You may enter file names like "myfile.cpp" or
598# directories like "/usr/src/myproject". Separate the files or directories
599# with spaces.
600
601INPUT = ./eet.dox \
602 ./examples.dox \
603 ../src/lib
604
605# This tag can be used to specify the character encoding of the source files
606# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
607# also the default input encoding. Doxygen uses libiconv (or the iconv built
608# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
609# the list of possible encodings.
610
611INPUT_ENCODING = UTF-8
612
613# If the value of the INPUT tag contains directories, you can use the
614# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
615# and *.h) to filter out the source-files in the directories. If left
616# blank the following patterns are tested:
617# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
618# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
619# *.f90 *.f *.for *.vhd *.vhdl
620
621FILE_PATTERNS = *.c \
622 *.h
623
624# The RECURSIVE tag can be used to turn specify whether or not subdirectories
625# should be searched for input files as well. Possible values are YES and NO.
626# If left blank NO is used.
627
628RECURSIVE = YES
629
630# The EXCLUDE tag can be used to specify files and/or directories that should
631# excluded from the INPUT source files. This way you can easily exclude a
632# subdirectory from a directory tree whose root is specified with the INPUT tag.
633
634EXCLUDE = ../src/lib/eet_amalgamation.c
635
636# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
637# directories that are symbolic links (a Unix file system feature) are excluded
638# from the input.
639
68EXCLUDE_SYMLINKS = NO 640EXCLUDE_SYMLINKS = NO
69EXCLUDE_PATTERNS = 641
70EXAMPLE_PATH = ../src/examples/ 642# If the value of the INPUT tag contains directories, you can use the
71EXAMPLE_PATTERNS = 643# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
644# certain files from those directories. Note that the wildcards are matched
645# against the file with absolute path, so to exclude all test directories
646# for example use the pattern */test/*
647
648EXCLUDE_PATTERNS =
649
650# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
651# (namespaces, classes, functions, etc.) that should be excluded from the
652# output. The symbol name can be a fully qualified name, a word, or if the
653# wildcard * is used, a substring. Examples: ANamespace, AClass,
654# AClass::ANamespace, ANamespace::*Test
655
656EXCLUDE_SYMBOLS =
657
658# The EXAMPLE_PATH tag can be used to specify one or more files or
659# directories that contain example code fragments that are included (see
660# the \include command).
661
662EXAMPLE_PATH = ../src/examples
663
664# If the value of the EXAMPLE_PATH tag contains directories, you can use the
665# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
666# and *.h) to filter out the source-files in the directories. If left
667# blank all files are included.
668
669EXAMPLE_PATTERNS = *.c,*.h,*.x
670
671# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
672# searched for input files to be used with the \include or \dontinclude
673# commands irrespective of the value of the RECURSIVE tag.
674# Possible values are YES and NO. If left blank NO is used.
675
72EXAMPLE_RECURSIVE = NO 676EXAMPLE_RECURSIVE = NO
73INPUT_FILTER = 677
678# The IMAGE_PATH tag can be used to specify one or more files or
679# directories that contain image that are included in the documentation (see
680# the \image command).
681
682IMAGE_PATH = ../doc/img
683
684# The INPUT_FILTER tag can be used to specify a program that doxygen should
685# invoke to filter for each input file. Doxygen will invoke the filter program
686# by executing (via popen()) the command <filter> <input-file>, where <filter>
687# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
688# input file. Doxygen will then use the output that the filter program writes
689# to standard output.
690# If FILTER_PATTERNS is specified, this tag will be
691# ignored.
692
693INPUT_FILTER =
694
695# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
696# basis.
697# Doxygen will compare the file name with each pattern and apply the
698# filter if there is a match.
699# The filters are a list of the form:
700# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
701# info on how filters are used. If FILTER_PATTERNS is empty or if
702# non of the patterns match the file name, INPUT_FILTER is applied.
703
704FILTER_PATTERNS =
705
706# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
707# INPUT_FILTER) will be used to filter the input files when producing source
708# files to browse (i.e. when SOURCE_BROWSER is set to YES).
709
74FILTER_SOURCE_FILES = NO 710FILTER_SOURCE_FILES = NO
711
712# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
713# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
714# and it is also possible to disable source filtering for a specific pattern
715# using *.ext= (so without naming a filter). This option only has effect when
716# FILTER_SOURCE_FILES is enabled.
717
718FILTER_SOURCE_PATTERNS =
719
720#---------------------------------------------------------------------------
721# configuration options related to source browsing
722#---------------------------------------------------------------------------
723
724# If the SOURCE_BROWSER tag is set to YES then a list of source files will
725# be generated. Documented entities will be cross-referenced with these sources.
726# Note: To get rid of all source code in the generated output, make sure also
727# VERBATIM_HEADERS is set to NO.
728
75SOURCE_BROWSER = NO 729SOURCE_BROWSER = NO
730
731# Setting the INLINE_SOURCES tag to YES will include the body
732# of functions and classes directly in the documentation.
733
76INLINE_SOURCES = NO 734INLINE_SOURCES = NO
735
736# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
737# doxygen to hide any special comment blocks from generated source code
738# fragments. Normal C and C++ comments will always remain visible.
739
740STRIP_CODE_COMMENTS = YES
741
742# If the REFERENCED_BY_RELATION tag is set to YES
743# then for each documented function all documented
744# functions referencing it will be listed.
745
77REFERENCED_BY_RELATION = YES 746REFERENCED_BY_RELATION = YES
747
748# If the REFERENCES_RELATION tag is set to YES
749# then for each documented function all documented entities
750# called/used by that function will be listed.
751
78REFERENCES_RELATION = YES 752REFERENCES_RELATION = YES
753
754# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
755# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
756# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
757# link to the source code.
758# Otherwise they will link to the documentation.
759
760REFERENCES_LINK_SOURCE = YES
761
762# If the USE_HTAGS tag is set to YES then the references to source code
763# will point to the HTML generated by the htags(1) tool instead of doxygen
764# built-in source browser. The htags tool is part of GNU's global source
765# tagging system (see http://www.gnu.org/software/global/global.html). You
766# will need version 4.8.6 or higher.
767
768USE_HTAGS = NO
769
770# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
771# will generate a verbatim copy of the header file for each class for
772# which an include is specified. Set to NO to disable this.
773
774VERBATIM_HEADERS = NO
775
776#---------------------------------------------------------------------------
777# configuration options related to the alphabetical class index
778#---------------------------------------------------------------------------
779
780# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
781# of all compounds will be generated. Enable this if the project
782# contains a lot of classes, structs, unions or interfaces.
783
79ALPHABETICAL_INDEX = YES 784ALPHABETICAL_INDEX = YES
785
786# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
787# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
788# in which this list will be split (can be a number in the range [1..20])
789
80COLS_IN_ALPHA_INDEX = 2 790COLS_IN_ALPHA_INDEX = 2
81IGNORE_PREFIX = eet_ _eet_ Eet_ _Eet_ EET_ _EET_ 791
792# In case all classes in a project start with a common prefix, all
793# classes will be put under the same header in the alphabetical index.
794# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
795# should be ignored while generating the index headers.
796
797IGNORE_PREFIX = eet_ \
798 _eet_ \
799 Eet_ \
800 _Eet_ \
801 EET_ \
802 _EET_
803
804#---------------------------------------------------------------------------
805# configuration options related to the HTML output
806#---------------------------------------------------------------------------
807
808# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
809# generate HTML output.
810
811GENERATE_HTML = YES
812
813# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
814# If a relative path is entered the value of OUTPUT_DIRECTORY will be
815# put in front of it. If left blank `html' will be used as the default path.
816
817HTML_OUTPUT = html
818
819# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
820# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
821# doxygen will generate files with .html extension.
822
823HTML_FILE_EXTENSION = .html
824
825# The HTML_HEADER tag can be used to specify a personal HTML header for
826# each generated HTML page. If it is left blank doxygen will generate a
827# standard header.
828
829HTML_HEADER = ./head.html
830
831# The HTML_FOOTER tag can be used to specify a personal HTML footer for
832# each generated HTML page. If it is left blank doxygen will generate a
833# standard footer.
834
835HTML_FOOTER = ./foot.html
836
837# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
838# style sheet that is used by each HTML page. It can be used to
839# fine-tune the look of the HTML output. If the tag is left blank doxygen
840# will generate a default style sheet. Note that doxygen will try to copy
841# the style sheet file to the HTML output directory, so don't put your own
842# stylesheet in the HTML output directory as well, or it will be erased!
843
844HTML_STYLESHEET = ./e.css
845
846# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
847# Doxygen will adjust the colors in the stylesheet and background images
848# according to this color. Hue is specified as an angle on a colorwheel,
849# see http://en.wikipedia.org/wiki/Hue for more information.
850# For instance the value 0 represents red, 60 is yellow, 120 is green,
851# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
852# The allowed range is 0 to 359.
853
854HTML_COLORSTYLE_HUE = 220
855
856# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
857# the colors in the HTML output. For a value of 0 the output will use
858# grayscales only. A value of 255 will produce the most vivid colors.
859
860HTML_COLORSTYLE_SAT = 100
861
862# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
863# the luminance component of the colors in the HTML output. Values below
864# 100 gradually make the output lighter, whereas values above 100 make
865# the output darker. The value divided by 100 is the actual gamma applied,
866# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
867# and 100 does not change the gamma.
868
869HTML_COLORSTYLE_GAMMA = 80
870
871# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
872# page will contain the date and time when the page was generated. Setting
873# this to NO can help when comparing the output of multiple runs.
874
875HTML_TIMESTAMP = YES
876
877# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
878# files or namespaces will be aligned in HTML using tables. If set to
879# NO a bullet list will be used.
880
881HTML_ALIGN_MEMBERS = YES
882
883# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
884# documentation will contain sections that can be hidden and shown after the
885# page has loaded. For this to work a browser that supports
886# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
887# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
888
889HTML_DYNAMIC_SECTIONS = YES
890
891# If the GENERATE_DOCSET tag is set to YES, additional index files
892# will be generated that can be used as input for Apple's Xcode 3
893# integrated development environment, introduced with OSX 10.5 (Leopard).
894# To create a documentation set, doxygen will generate a Makefile in the
895# HTML output directory. Running make will produce the docset in that
896# directory and running "make install" will install the docset in
897# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
898# it at startup.
899# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
900# for more information.
901
902GENERATE_DOCSET = YES
903
904# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
905# feed. A documentation feed provides an umbrella under which multiple
906# documentation sets from a single provider (such as a company or product suite)
907# can be grouped.
908
909DOCSET_FEEDNAME = "Doxygen generated docs"
910
911# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
912# should uniquely identify the documentation set bundle. This should be a
913# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
914# will append .docset to the name.
915
916DOCSET_BUNDLE_ID = org.enlightenment.Eet
917
918# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
919# the documentation publisher. This should be a reverse domain-name style
920# string, e.g. com.mycompany.MyDocSet.documentation.
921
922DOCSET_PUBLISHER_ID = org.enlightenment.Eet
923
924# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
925
926DOCSET_PUBLISHER_NAME = Enlightenment
927
928# If the GENERATE_HTMLHELP tag is set to YES, additional index files
929# will be generated that can be used as input for tools like the
930# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
931# of the generated HTML documentation.
932
933GENERATE_HTMLHELP = YES
934
935# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
936# be used to specify the file name of the resulting .chm file. You
937# can add a path in front of the file if the result should not be
938# written to the html output directory.
939
940CHM_FILE =
941
942# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
943# be used to specify the location (absolute path including file name) of
944# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
945# the HTML help compiler on the generated index.hhp.
946
947HHC_LOCATION =
948
949# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
950# controls if a separate .chi index file is generated (YES) or that
951# it should be included in the master .chm file (NO).
952
953GENERATE_CHI = NO
954
955# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
956# is used to encode HtmlHelp index (hhk), content (hhc) and project file
957# content.
958
959CHM_INDEX_ENCODING =
960
961# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
962# controls whether a binary table of contents is generated (YES) or a
963# normal table of contents (NO) in the .chm file.
964
965BINARY_TOC = NO
966
967# The TOC_EXPAND flag can be set to YES to add extra items for group members
968# to the contents of the HTML help documentation and to the tree view.
969
970TOC_EXPAND = NO
971
972# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
973# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
974# that can be used as input for Qt's qhelpgenerator to generate a
975# Qt Compressed Help (.qch) of the generated HTML documentation.
976
977GENERATE_QHP = NO
978
979# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
980# be used to specify the file name of the resulting .qch file.
981# The path specified is relative to the HTML output folder.
982
983QCH_FILE =
984
985# The QHP_NAMESPACE tag specifies the namespace to use when generating
986# Qt Help Project output. For more information please see
987# http://doc.trolltech.com/qthelpproject.html#namespace
988
989QHP_NAMESPACE = org.enlightenment.Eet
990
991# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
992# Qt Help Project output. For more information please see
993# http://doc.trolltech.com/qthelpproject.html#virtual-folders
994
995QHP_VIRTUAL_FOLDER = doc
996
997# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
998# add. For more information please see
999# http://doc.trolltech.com/qthelpproject.html#custom-filters
1000
1001QHP_CUST_FILTER_NAME =
1002
1003# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
1004# custom filter to add. For more information please see
1005# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
1006# Qt Help Project / Custom Filters</a>.
1007
1008QHP_CUST_FILTER_ATTRS =
1009
1010# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
1011# project's
1012# filter section matches.
1013# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
1014# Qt Help Project / Filter Attributes</a>.
1015
1016QHP_SECT_FILTER_ATTRS =
1017
1018# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
1019# be used to specify the location of Qt's qhelpgenerator.
1020# If non-empty doxygen will try to run qhelpgenerator on the generated
1021# .qhp file.
1022
1023QHG_LOCATION =
1024
1025# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
1026# will be generated, which together with the HTML files, form an Eclipse help
1027# plugin. To install this plugin and make it available under the help contents
1028# menu in Eclipse, the contents of the directory containing the HTML and XML
1029# files needs to be copied into the plugins directory of eclipse. The name of
1030# the directory within the plugins directory should be the same as
1031# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
1032# the help appears.
1033
1034GENERATE_ECLIPSEHELP = NO
1035
1036# A unique identifier for the eclipse help plugin. When installing the plugin
1037# the directory name containing the HTML and XML files should also have
1038# this name.
1039
1040ECLIPSE_DOC_ID = org.enlightenment.Eet
1041
1042# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
1043# top of each HTML page. The value NO (the default) enables the index and
1044# the value YES disables it.
1045
1046DISABLE_INDEX = YES
1047
1048# This tag can be used to set the number of enum values (range [0,1..20])
1049# that doxygen will group on one line in the generated HTML documentation.
1050# Note that a value of 0 will completely suppress the enum values from appearing in the overview section.
1051
1052ENUM_VALUES_PER_LINE = 1
1053
1054# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
1055# structure should be generated to display hierarchical information.
1056# If the tag value is set to YES, a side panel will be generated
1057# containing a tree-like index structure (just like the one that
1058# is generated for HTML Help). For this to work a browser that supports
1059# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
1060# Windows users are probably better off using the HTML help feature.
1061
82GENERATE_TREEVIEW = NO 1062GENERATE_TREEVIEW = NO
1063
1064# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
1065# and Class Hierarchy pages using a tree view instead of an ordered list.
1066
1067USE_INLINE_TREES = NO
1068
1069# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
1070# used to set the initial width (in pixels) of the frame in which the tree
1071# is shown.
1072
83TREEVIEW_WIDTH = 250 1073TREEVIEW_WIDTH = 250
1074
1075# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
1076# links to external symbols imported via tag files in a separate window.
1077
1078EXT_LINKS_IN_WINDOW = NO
1079
1080# Use this tag to change the font size of Latex formulas included
1081# as images in the HTML documentation. The default is 10. Note that
1082# when you change the font size after a successful doxygen run you need
1083# to manually remove any form_*.png images from the HTML output directory
1084# to force them to be regenerated.
1085
1086FORMULA_FONTSIZE = 10
1087
1088# Use the FORMULA_TRANPARENT tag to determine whether or not the images
1089# generated for formulas are transparent PNGs. Transparent PNGs are
1090# not supported properly for IE 6.0, but are supported on all modern browsers.
1091# Note that when changing this option you need to delete any form_*.png files
1092# in the HTML output before the changes have effect.
1093
1094FORMULA_TRANSPARENT = YES
1095
1096# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
1097# (see http://www.mathjax.org) which uses client side Javascript for the
1098# rendering instead of using prerendered bitmaps. Use this if you do not
1099# have LaTeX installed or if you want to formulas look prettier in the HTML
1100# output. When enabled you also need to install MathJax separately and
1101# configure the path to it using the MATHJAX_RELPATH option.
1102
1103USE_MATHJAX = NO
1104
1105# When MathJax is enabled you need to specify the location relative to the
1106# HTML output directory using the MATHJAX_RELPATH option. The destination
1107# directory should contain the MathJax.js script. For instance, if the mathjax
1108# directory is located at the same level as the HTML output directory, then
1109# MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing
1110# MathJax, but it is strongly recommended to install a local copy of MathJax
1111# before deployment.
1112
1113MATHJAX_RELPATH = http://www.mathjax.org/mathjax
1114
1115# When the SEARCHENGINE tag is enabled doxygen will generate a search box
1116# for the HTML output. The underlying search engine uses javascript
1117# and DHTML and should work on any modern browser. Note that when using
1118# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
1119# (GENERATE_DOCSET) there is already a search function so this one should
1120# typically be disabled. For large projects the javascript based search engine
1121# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
1122
1123SEARCHENGINE = NO
1124
1125# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
1126# implemented using a PHP enabled web server instead of at the web client
1127# using Javascript. Doxygen will generate the search PHP script and index
1128# file to put on the web server. The advantage of the server
1129# based approach is that it scales better to large projects and allows
1130# full text search. The disadvantages are that it is more difficult to setup
1131# and does not have live searching capabilities.
1132
1133SERVER_BASED_SEARCH = NO
1134
1135#---------------------------------------------------------------------------
1136# configuration options related to the LaTeX output
1137#---------------------------------------------------------------------------
1138
1139# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
1140# generate Latex output.
1141
84GENERATE_LATEX = YES 1142GENERATE_LATEX = YES
1143
1144# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
1145# If a relative path is entered the value of OUTPUT_DIRECTORY will be
1146# put in front of it. If left blank `latex' will be used as the default path.
1147
85LATEX_OUTPUT = latex 1148LATEX_OUTPUT = latex
1149
1150# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
1151# invoked. If left blank `latex' will be used as the default command name.
1152# Note that when enabling USE_PDFLATEX this option is only used for
1153# generating bitmaps for formulas in the HTML output, but not in the
1154# Makefile that is written to the output directory.
1155
86LATEX_CMD_NAME = latex 1156LATEX_CMD_NAME = latex
1157
1158# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
1159# generate index for LaTeX. If left blank `makeindex' will be used as the
1160# default command name.
1161
87MAKEINDEX_CMD_NAME = makeindex 1162MAKEINDEX_CMD_NAME = makeindex
1163
1164# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
1165# LaTeX documents. This may be useful for small projects and may help to
1166# save some trees in general.
1167
88COMPACT_LATEX = NO 1168COMPACT_LATEX = NO
1169
1170# The PAPER_TYPE tag can be used to set the paper type that is used
1171# by the printer. Possible values are: a4, letter, legal and
1172# executive. If left blank a4wide will be used.
1173
89PAPER_TYPE = a4wide 1174PAPER_TYPE = a4wide
90EXTRA_PACKAGES = 1175
91LATEX_HEADER = 1176# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
1177# packages that should be included in the LaTeX output.
1178
1179EXTRA_PACKAGES =
1180
1181# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
1182# the generated latex document. The header should contain everything until
1183# the first chapter. If it is left blank doxygen will generate a
1184# standard header. Notice: only use this tag if you know what you are doing!
1185
1186LATEX_HEADER =
1187
1188# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
1189# is prepared for conversion to pdf (using ps2pdf). The pdf file will
1190# contain links (just like the HTML output) instead of page references
1191# This makes the output suitable for online browsing using a pdf viewer.
1192
92PDF_HYPERLINKS = YES 1193PDF_HYPERLINKS = YES
1194
1195# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
1196# plain latex in the generated Makefile. Set this option to YES to get a
1197# higher quality PDF documentation.
1198
93USE_PDFLATEX = YES 1199USE_PDFLATEX = YES
1200
1201# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
1202# command to the generated LaTeX files. This will instruct LaTeX to keep
1203# running if errors occur, instead of asking the user for help.
1204# This option is also used when generating formulas in HTML.
1205
94LATEX_BATCHMODE = NO 1206LATEX_BATCHMODE = NO
1207
1208# If LATEX_HIDE_INDICES is set to YES then doxygen will not
1209# include the index chapters (such as File Index, Compound Index, etc.)
1210# in the output.
1211
1212LATEX_HIDE_INDICES = NO
1213
1214# If LATEX_SOURCE_CODE is set to YES then doxygen will include
1215# source code with syntax highlighting in the LaTeX output.
1216# Note that which sources are shown also depends on other settings
1217# such as SOURCE_BROWSER.
1218
1219LATEX_SOURCE_CODE = NO
1220
1221#---------------------------------------------------------------------------
1222# configuration options related to the RTF output
1223#---------------------------------------------------------------------------
1224
1225# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
1226# The RTF output is optimized for Word 97 and may not look very pretty with
1227# other RTF readers or editors.
1228
95GENERATE_RTF = NO 1229GENERATE_RTF = NO
1230
1231# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
1232# If a relative path is entered the value of OUTPUT_DIRECTORY will be
1233# put in front of it. If left blank `rtf' will be used as the default path.
1234
96RTF_OUTPUT = rtf 1235RTF_OUTPUT = rtf
1236
1237# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
1238# RTF documents. This may be useful for small projects and may help to
1239# save some trees in general.
1240
97COMPACT_RTF = NO 1241COMPACT_RTF = NO
1242
1243# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
1244# will contain hyperlink fields. The RTF file will
1245# contain links (just like the HTML output) instead of page references.
1246# This makes the output suitable for online browsing using WORD or other
1247# programs which support those fields.
1248# Note: wordpad (write) and others do not support links.
1249
98RTF_HYPERLINKS = NO 1250RTF_HYPERLINKS = NO
99RTF_STYLESHEET_FILE = 1251
100RTF_EXTENSIONS_FILE = 1252# Load stylesheet definitions from file. Syntax is similar to doxygen's
1253# config file, i.e. a series of assignments. You only have to provide
1254# replacements, missing definitions are set to their default value.
1255
1256RTF_STYLESHEET_FILE =
1257
1258# Set optional variables used in the generation of an rtf document.
1259# Syntax is similar to doxygen's config file.
1260
1261RTF_EXTENSIONS_FILE =
1262
1263#---------------------------------------------------------------------------
1264# configuration options related to the man page output
1265#---------------------------------------------------------------------------
1266
1267# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
1268# generate man pages
1269
101GENERATE_MAN = YES 1270GENERATE_MAN = YES
1271
1272# The MAN_OUTPUT tag is used to specify where the man pages will be put.
1273# If a relative path is entered the value of OUTPUT_DIRECTORY will be
1274# put in front of it. If left blank `man' will be used as the default path.
1275
102MAN_OUTPUT = man 1276MAN_OUTPUT = man
1277
1278# The MAN_EXTENSION tag determines the extension that is added to
1279# the generated man pages (default is the subroutine's section .3)
1280
103MAN_EXTENSION = .3 1281MAN_EXTENSION = .3
1282
1283# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
1284# then it will generate one additional man file for each entity
1285# documented in the real man page(s). These additional files
1286# only source the real man page, but without them the man command
1287# would be unable to find the correct page. The default is NO.
1288
104MAN_LINKS = YES 1289MAN_LINKS = YES
1290
1291#---------------------------------------------------------------------------
1292# configuration options related to the XML output
1293#---------------------------------------------------------------------------
1294
1295# If the GENERATE_XML tag is set to YES Doxygen will
1296# generate an XML file that captures the structure of
1297# the code including all documentation.
1298
105GENERATE_XML = NO 1299GENERATE_XML = NO
106XML_SCHEMA = 1300
107XML_DTD = 1301# The XML_OUTPUT tag is used to specify where the XML pages will be put.
1302# If a relative path is entered the value of OUTPUT_DIRECTORY will be
1303# put in front of it. If left blank `xml' will be used as the default path.
1304
1305XML_OUTPUT = xml
1306
1307# The XML_SCHEMA tag can be used to specify an XML schema,
1308# which can be used by a validating XML parser to check the
1309# syntax of the XML files.
1310
1311XML_SCHEMA =
1312
1313# The XML_DTD tag can be used to specify an XML DTD,
1314# which can be used by a validating XML parser to check the
1315# syntax of the XML files.
1316
1317XML_DTD =
1318
1319# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
1320# dump the program listings (including syntax highlighting
1321# and cross-referencing information) to the XML output. Note that
1322# enabling this will significantly increase the size of the XML output.
1323
1324XML_PROGRAMLISTING = YES
1325
1326#---------------------------------------------------------------------------
1327# configuration options for the AutoGen Definitions output
1328#---------------------------------------------------------------------------
1329
1330# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
1331# generate an AutoGen Definitions (see autogen.sf.net) file
1332# that captures the structure of the code including all
1333# documentation. Note that this feature is still experimental
1334# and incomplete at the moment.
1335
108GENERATE_AUTOGEN_DEF = NO 1336GENERATE_AUTOGEN_DEF = NO
1337
1338#---------------------------------------------------------------------------
1339# configuration options related to the Perl module output
1340#---------------------------------------------------------------------------
1341
1342# If the GENERATE_PERLMOD tag is set to YES Doxygen will
1343# generate a Perl module file that captures the structure of
1344# the code including all documentation. Note that this
1345# feature is still experimental and incomplete at the
1346# moment.
1347
1348GENERATE_PERLMOD = NO
1349
1350# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
1351# the necessary Makefile rules, Perl scripts and LaTeX code to be able
1352# to generate PDF and DVI output from the Perl module output.
1353
1354PERLMOD_LATEX = NO
1355
1356# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
1357# nicely formatted so it can be parsed by a human reader.
1358# This is useful
1359# if you want to understand what is going on.
1360# On the other hand, if this
1361# tag is set to NO the size of the Perl module output will be much smaller
1362# and Perl will parse it just the same.
1363
1364PERLMOD_PRETTY = YES
1365
1366# The names of the make variables in the generated doxyrules.make file
1367# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
1368# This is useful so different doxyrules.make files included by the same
1369# Makefile don't overwrite each other's variables.
1370
1371PERLMOD_MAKEVAR_PREFIX =
1372
1373#---------------------------------------------------------------------------
1374# Configuration options related to the preprocessor
1375#---------------------------------------------------------------------------
1376
1377# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
1378# evaluate all C-preprocessor directives found in the sources and include
1379# files.
1380
109ENABLE_PREPROCESSING = YES 1381ENABLE_PREPROCESSING = YES
110MACRO_EXPANSION = NO 1382
111EXPAND_ONLY_PREDEF = NO 1383# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
1384# names in the source code. If set to NO (the default) only conditional
1385# compilation will be performed. Macro expansion can be done in a controlled
1386# way by setting EXPAND_ONLY_PREDEF to YES.
1387
1388MACRO_EXPANSION = YES
1389
1390# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
1391# then the macro expansion is limited to the macros specified with the
1392# PREDEFINED and EXPAND_AS_DEFINED tags.
1393
1394EXPAND_ONLY_PREDEF = YES
1395
1396# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
1397# in the INCLUDE_PATH (see below) will be search if a #include is found.
1398
112SEARCH_INCLUDES = NO 1399SEARCH_INCLUDES = NO
1400
1401# The INCLUDE_PATH tag can be used to specify one or more directories that
1402# contain include files that are not input files but should be processed by
1403# the preprocessor.
1404
113INCLUDE_PATH = 1405INCLUDE_PATH =
114INCLUDE_FILE_PATTERNS = 1406
115PREDEFINED = 1407# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
116EXPAND_AS_DEFINED = 1408# patterns (like *.h and *.hpp) to filter out the header-files in the
1409# directories. If left blank, the patterns specified with FILE_PATTERNS will
1410# be used.
1411
1412INCLUDE_FILE_PATTERNS =
1413
1414# The PREDEFINED tag can be used to specify one or more macro names that
1415# are defined before the preprocessor is started (similar to the -D option of
1416# gcc). The argument of the tag is a list of macros of the form: name
1417# or name=definition (no spaces). If the definition and the = are
1418# omitted =1 is assumed. To prevent a macro definition from being
1419# undefined via #undef or recursively expanded use the := operator
1420# instead of the = operator.
1421
1422PREDEFINED = EINA_MAGIC_DEBUG \
1423 __UNUSED__= \
1424 EINA_ARG_NONNULL()= \
1425 EINA_MALLOC= \
1426 EINA_WARN_UNUSED_RESULT= \
1427 EAPI= \
1428 EINA_PURE= \
1429 EINA_CONST=
1430
1431# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
1432# this tag can be used to specify a list of macro names that should be expanded.
1433# The macro definition that is found in the sources will be used.
1434# Use the PREDEFINED tag if you want to use a different macro definition that overrules the definition found in the source code.
1435
1436EXPAND_AS_DEFINED =
1437
1438# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
1439# doxygen's preprocessor will remove all references to function-like macros
1440# that are alone on a line, have an all uppercase name, and do not end with a
1441# semicolon, because these will confuse the parser if not removed.
1442
117SKIP_FUNCTION_MACROS = YES 1443SKIP_FUNCTION_MACROS = YES
118TAGFILES = 1444
119GENERATE_TAGFILE = 1445#---------------------------------------------------------------------------
1446# Configuration::additions related to external references
1447#---------------------------------------------------------------------------
1448
1449# The TAGFILES option can be used to specify one or more tagfiles.
1450# Optionally an initial location of the external documentation
1451# can be added for each tagfile. The format of a tag file without
1452# this location is as follows:
1453#
1454# TAGFILES = file1 file2 ...
1455# Adding location for the tag files is done as follows:
1456#
1457# TAGFILES = file1=loc1 "file2 = loc2" ...
1458# where "loc1" and "loc2" can be relative or absolute paths or
1459# URLs. If a location is present for each tag, the installdox tool
1460# does not have to be run to correct the links.
1461# Note that each tag file must have a unique name
1462# (where the name does NOT include the path)
1463# If a tag file is not located in the directory in which doxygen
1464# is run, you must also specify the path to the tagfile here.
1465
1466TAGFILES =
1467
1468# When a file name is specified after GENERATE_TAGFILE, doxygen will create
1469# a tag file that is based on the input files it reads.
1470
1471GENERATE_TAGFILE =
1472
1473# If the ALLEXTERNALS tag is set to YES all external classes will be listed
1474# in the class index. If set to NO only the inherited external classes
1475# will be listed.
1476
120ALLEXTERNALS = NO 1477ALLEXTERNALS = NO
1478
1479# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
1480# in the modules index. If set to NO, only the current project's groups will
1481# be listed.
1482
121EXTERNAL_GROUPS = YES 1483EXTERNAL_GROUPS = YES
1484
1485# The PERL_PATH should be the absolute path and name of the perl script
1486# interpreter (i.e. the result of `which perl').
1487
122PERL_PATH = /usr/bin/perl 1488PERL_PATH = /usr/bin/perl
1489
1490#---------------------------------------------------------------------------
1491# Configuration options related to the dot tool
1492#---------------------------------------------------------------------------
1493
1494# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
1495# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
1496# or super classes. Setting the tag to NO turns the diagrams off. Note that
1497# this option also works with HAVE_DOT disabled, but it is recommended to
1498# install and use dot, since it yields more powerful graphs.
1499
123CLASS_DIAGRAMS = NO 1500CLASS_DIAGRAMS = NO
1501
1502# You can define message sequence charts within doxygen comments using the \msc
1503# command. Doxygen will then run the mscgen tool (see
1504# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
1505# documentation. The MSCGEN_PATH tag allows you to specify the directory where
1506# the mscgen tool resides. If left empty the tool is assumed to be found in the
1507# default search path.
1508
1509MSCGEN_PATH =
1510
1511# If set to YES, the inheritance and collaboration graphs will hide
1512# inheritance and usage relations if the target is undocumented
1513# or is not a class.
1514
124HIDE_UNDOC_RELATIONS = YES 1515HIDE_UNDOC_RELATIONS = YES
1516
1517# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
1518# available from the path. This tool is part of Graphviz, a graph visualization
1519# toolkit from AT&T and Lucent Bell Labs. The other options in this section
1520# have no effect if this option is set to NO (the default)
1521
125HAVE_DOT = NO 1522HAVE_DOT = NO
1523
1524# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
1525# allowed to run in parallel. When set to 0 (the default) doxygen will
1526# base this on the number of processors available in the system. You can set it
1527# explicitly to a value larger than 0 to get control over the balance
1528# between CPU load and processing speed.
1529
1530DOT_NUM_THREADS = 0
1531
1532# By default doxygen will write a font called Helvetica to the output
1533# directory and reference it in all dot files that doxygen generates.
1534# When you want a differently looking font you can specify the font name
1535# using DOT_FONTNAME. You need to make sure dot is able to find the font,
1536# which can be done by putting it in a standard location or by setting the
1537# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
1538# containing the font.
1539
1540DOT_FONTNAME = Helvetica
1541
1542# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
1543# The default size is 10pt.
1544
1545DOT_FONTSIZE = 10
1546
1547# By default doxygen will tell dot to use the output directory to look for the
1548# FreeSans.ttf font (which doxygen will put there itself). If you specify a
1549# different font using DOT_FONTNAME you can set the path where dot
1550# can find it using this tag.
1551
1552DOT_FONTPATH =
1553
1554# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
1555# will generate a graph for each documented class showing the direct and
1556# indirect inheritance relations. Setting this tag to YES will force the
1557# the CLASS_DIAGRAMS tag to NO.
1558
126CLASS_GRAPH = NO 1559CLASS_GRAPH = NO
1560
1561# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
1562# will generate a graph for each documented class showing the direct and
1563# indirect implementation dependencies (inheritance, containment, and
1564# class references variables) of the class with other documented classes.
1565
127COLLABORATION_GRAPH = NO 1566COLLABORATION_GRAPH = NO
1567
1568# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
1569# will generate a graph for groups, showing the direct groups dependencies
1570
1571GROUP_GRAPHS = YES
1572
1573# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
1574# collaboration diagrams in a style similar to the OMG's Unified Modeling
1575# Language.
1576
1577UML_LOOK = NO
1578
1579# If set to YES, the inheritance and collaboration graphs will show the
1580# relations between templates and their instances.
1581
128TEMPLATE_RELATIONS = NO 1582TEMPLATE_RELATIONS = NO
1583
1584# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
1585# tags are set to YES then doxygen will generate a graph for each documented
1586# file showing the direct and indirect include dependencies of the file with
1587# other documented files.
1588
129INCLUDE_GRAPH = NO 1589INCLUDE_GRAPH = NO
1590
1591# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
1592# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
1593# documented header file showing the documented files that directly or
1594# indirectly include this file.
1595
130INCLUDED_BY_GRAPH = NO 1596INCLUDED_BY_GRAPH = NO
1597
1598# If the CALL_GRAPH and HAVE_DOT options are set to YES then
1599# doxygen will generate a call dependency graph for every global function
1600# or class method. Note that enabling this option will significantly increase
1601# the time of a run. So in most cases it will be better to enable call graphs
1602# for selected functions only using the \callgraph command.
1603
1604CALL_GRAPH = NO
1605
1606# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
1607# doxygen will generate a caller dependency graph for every global function
1608# or class method. Note that enabling this option will significantly increase
1609# the time of a run. So in most cases it will be better to enable caller
1610# graphs for selected functions only using the \callergraph command.
1611
1612CALLER_GRAPH = NO
1613
1614# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
1615# will generate a graphical hierarchy of all classes instead of a textual one.
1616
131GRAPHICAL_HIERARCHY = NO 1617GRAPHICAL_HIERARCHY = NO
1618
1619# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
1620# then doxygen will show the dependencies a directory has on other directories
1621# in a graphical way. The dependency relations are determined by the #include
1622# relations between the files in the directories.
1623
1624DIRECTORY_GRAPH = YES
1625
1626# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
1627# generated by dot. Possible values are png, svg, gif or svg.
1628# If left blank png will be used.
1629
132DOT_IMAGE_FORMAT = png 1630DOT_IMAGE_FORMAT = png
133DOT_PATH = 1631
134DOTFILE_DIRS = 1632# The tag DOT_PATH can be used to specify the path where the dot tool can be
135MAX_DOT_GRAPH_WIDTH = 512 1633# found. If left blank, it is assumed the dot tool can be found in the path.
136MAX_DOT_GRAPH_HEIGHT = 512 1634
1635DOT_PATH =
1636
1637# The DOTFILE_DIRS tag can be used to specify one or more directories that
1638# contain dot files that are included in the documentation (see the
1639# \dotfile command).
1640
1641DOTFILE_DIRS =
1642
1643# The MSCFILE_DIRS tag can be used to specify one or more directories that
1644# contain msc files that are included in the documentation (see the
1645# \mscfile command).
1646
1647MSCFILE_DIRS =
1648
1649# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
1650# nodes that will be shown in the graph. If the number of nodes in a graph
1651# becomes larger than this value, doxygen will truncate the graph, which is
1652# visualized by representing a node as a red box. Note that doxygen if the
1653# number of direct children of the root node in a graph is already larger than
1654# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
1655# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
1656
1657DOT_GRAPH_MAX_NODES = 50
1658
1659# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
1660# graphs generated by dot. A depth value of 3 means that only nodes reachable
1661# from the root by following a path via at most 3 edges will be shown. Nodes
1662# that lay further from the root node will be omitted. Note that setting this
1663# option to 1 or 2 may greatly reduce the computation time needed for large
1664# code bases. Also note that the size of a graph can be further restricted by
1665# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
1666
1667MAX_DOT_GRAPH_DEPTH = 0
1668
1669# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
1670# background. This is disabled by default, because dot on Windows does not
1671# seem to support this out of the box. Warning: Depending on the platform used,
1672# enabling this option may lead to badly anti-aliased labels on the edges of
1673# a graph (i.e. they become hard to read).
1674
1675DOT_TRANSPARENT = YES
1676
1677# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
1678# files in one run (i.e. multiple -o and -T options on the command line). This
1679# makes dot run faster, but since only newer versions of dot (>1.8.10)
1680# support this, this feature is disabled by default.
1681
1682DOT_MULTI_TARGETS = NO
1683
1684# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
1685# generate a legend page explaining the meaning of the various boxes and
1686# arrows in the dot generated graphs.
1687
137GENERATE_LEGEND = YES 1688GENERATE_LEGEND = YES
1689
1690# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
1691# remove the intermediate dot files that are used to generate
1692# the various graphs.
1693
138DOT_CLEANUP = YES 1694DOT_CLEANUP = YES
139SEARCHENGINE = NO
diff --git a/libraries/eet/doc/Doxyfile.in b/libraries/eet/doc/Doxyfile.in
index 4ed5452..eadf82a 100644
--- a/libraries/eet/doc/Doxyfile.in
+++ b/libraries/eet/doc/Doxyfile.in
@@ -1,139 +1,1694 @@
1# Doxyfile 1.7.3
2
3# This file describes the settings to be used by the documentation system
4# doxygen (www.doxygen.org) for a project.
5#
6# All text after a hash (#) is considered a comment and will be ignored.
7# The format is:
8# TAG = value [value, ...]
9# For lists items can also be appended using:
10# TAG += value [value, ...]
11# Values that contain spaces should be placed between quotes (" ").
12
13#---------------------------------------------------------------------------
14# Project related configuration options
15#---------------------------------------------------------------------------
16
17# This tag specifies the encoding used for all characters in the config file
18# that follow. The default is UTF-8 which is also the encoding used for all
19# text before the first occurrence of this tag. Doxygen uses libiconv (or the
20# iconv built into libc) for the transcoding. See
21# http://www.gnu.org/software/libiconv for the list of possible encodings.
22
23DOXYFILE_ENCODING = UTF-8
24
25# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
26# by quotes) that should identify the project.
27
1PROJECT_NAME = Eet 28PROJECT_NAME = Eet
29
30# The PROJECT_NUMBER tag can be used to enter a project or revision number.
31# This could be handy for archiving the generated documentation or
32# if some version control system is used.
33
2PROJECT_NUMBER = @PACKAGE_VERSION@ 34PROJECT_NUMBER = @PACKAGE_VERSION@
35
36# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
37
38PROJECT_BRIEF =
39
40# With the PROJECT_LOGO tag one can specify an logo or icon that is
41# included in the documentation. The maximum height of the logo should not
42# exceed 55 pixels and the maximum width should not exceed 200 pixels.
43# Doxygen will copy the logo to the output directory.
44
45PROJECT_LOGO =
46
47# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
48# base path where the generated documentation will be put.
49# If a relative path is entered, it will be relative to the location
50# where doxygen was started. If left blank the current directory will be used.
51
3OUTPUT_DIRECTORY = . 52OUTPUT_DIRECTORY = .
4INPUT = @srcdir@/eet.dox @srcdir@/examples.dox @top_srcdir@/src/lib 53
5IMAGE_PATH = img 54# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
55# 4096 sub-directories (in 2 levels) under the output directory of each output
56# format and will distribute the generated files over these directories.
57# Enabling this option can be useful when feeding doxygen a huge amount of
58# source files, where putting all generated files in the same directory would
59# otherwise cause performance problems for the file system.
60
61CREATE_SUBDIRS = NO
62
63# The OUTPUT_LANGUAGE tag is used to specify the language in which all
64# documentation generated by doxygen is written. Doxygen will use this
65# information to generate all constant output in the proper language.
66# The default language is English, other supported languages are:
67# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
68# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
69# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
70# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
71# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
72# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
73
6OUTPUT_LANGUAGE = English 74OUTPUT_LANGUAGE = English
7GENERATE_HTML = YES 75
8HTML_OUTPUT = html 76# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
9HTML_FILE_EXTENSION = .html 77# include brief member descriptions after the members that are listed in
10HTML_HEADER = @srcdir@/head.html 78# the file and class documentation (similar to JavaDoc).
11HTML_FOOTER = @srcdir@/foot.html 79# Set to NO to disable this.
12HTML_STYLESHEET = @srcdir@/e.css 80
13HTML_ALIGN_MEMBERS = YES
14ENUM_VALUES_PER_LINE = 1
15GENERATE_HTMLHELP = NO
16CHM_FILE =
17HHC_LOCATION =
18GENERATE_CHI = NO
19BINARY_TOC = NO
20TOC_EXPAND = NO
21DISABLE_INDEX = YES
22EXTRACT_ALL = NO
23EXTRACT_PRIVATE = NO
24EXTRACT_STATIC = NO
25EXTRACT_LOCAL_CLASSES = NO
26HIDE_UNDOC_MEMBERS = YES
27HIDE_UNDOC_CLASSES = YES
28HIDE_FRIEND_COMPOUNDS = YES
29BRIEF_MEMBER_DESC = YES 81BRIEF_MEMBER_DESC = YES
82
83# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
84# the brief description of a member or function before the detailed description.
85# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
86# brief descriptions will be completely suppressed.
87
30REPEAT_BRIEF = YES 88REPEAT_BRIEF = YES
89
90# This tag implements a quasi-intelligent brief description abbreviator
91# that is used to form the text in various listings. Each string
92# in this list, if found as the leading text of the brief description, will be
93# stripped from the text and the result after processing the whole list, is
94# used as the annotated text. Otherwise, the brief description is used as-is.
95# If left blank, the following values are used ("$name" is automatically
96# replaced with the name of the entity): "The $name class" "The $name widget"
97# "The $name file" "is" "provides" "specifies" "contains"
98# "represents" "a" "an" "the"
99
100ABBREVIATE_BRIEF =
101
102# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
103# Doxygen will generate a detailed section even if there is only a brief
104# description.
105
31ALWAYS_DETAILED_SEC = NO 106ALWAYS_DETAILED_SEC = NO
107
108# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
109# inherited members of a class in the documentation of that class as if those
110# members were ordinary class members. Constructors, destructors and assignment
111# operators of the base classes will not be shown.
112
32INLINE_INHERITED_MEMB = NO 113INLINE_INHERITED_MEMB = NO
114
115# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
116# path before files name in the file list and in the header files. If set
117# to NO the shortest path that makes the file name unique will be used.
118
33FULL_PATH_NAMES = NO 119FULL_PATH_NAMES = NO
34STRIP_FROM_PATH = 120
35INTERNAL_DOCS = NO 121# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
36STRIP_CODE_COMMENTS = NO 122# can be used to strip a user-defined part of the path. Stripping is
37CASE_SENSE_NAMES = YES 123# only done if one of the specified strings matches the left-hand part of
124# the path. The tag can be used to show relative paths in the file list.
125# If left blank the directory from which doxygen is run is used as the
126# path to strip.
127
128STRIP_FROM_PATH =
129
130# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
131# the path mentioned in the documentation of a class, which tells
132# the reader which header file to include in order to use a class.
133# If left blank only the name of the header file containing the class
134# definition is used. Otherwise one should specify the include paths that
135# are normally passed to the compiler using the -I flag.
136
137STRIP_FROM_INC_PATH =
138
139# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
140# (but less readable) file names. This can be useful if your file system
141# doesn't support long names like on DOS, Mac, or CD-ROM.
142
38SHORT_NAMES = NO 143SHORT_NAMES = NO
39HIDE_SCOPE_NAMES = NO 144
40VERBATIM_HEADERS = NO 145# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
41SHOW_INCLUDE_FILES = NO 146# will interpret the first line (until the first dot) of a JavaDoc-style
147# comment as the brief description. If set to NO, the JavaDoc
148# comments will behave just like regular Qt-style comments
149# (thus requiring an explicit @brief command for a brief description.)
150
42JAVADOC_AUTOBRIEF = YES 151JAVADOC_AUTOBRIEF = YES
152
153# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
154# interpret the first line (until the first dot) of a Qt-style
155# comment as the brief description. If set to NO, the comments
156# will behave just like regular Qt-style comments (thus requiring
157# an explicit \brief command for a brief description.)
158
159QT_AUTOBRIEF = NO
160
161# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
162# treat a multi-line C++ special comment block (i.e. a block of //! or ///
163# comments) as a brief description. This used to be the default behaviour.
164# The new default is to treat a multi-line C++ comment block as a detailed
165# description. Set this tag to YES if you prefer the old behaviour instead.
166
43MULTILINE_CPP_IS_BRIEF = NO 167MULTILINE_CPP_IS_BRIEF = NO
44DETAILS_AT_TOP = NO 168
169# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
170# member inherits the documentation from any documented member that it
171# re-implements.
172
45INHERIT_DOCS = YES 173INHERIT_DOCS = YES
46INLINE_INFO = YES 174
47SORT_MEMBER_DOCS = YES 175# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
48DISTRIBUTE_GROUP_DOC = NO 176# a new page for each member. If set to NO, the documentation of a member will
177# be part of the file/class/namespace that contains it.
178
179SEPARATE_MEMBER_PAGES = NO
180
181# The TAB_SIZE tag can be used to set the number of spaces in a tab.
182# Doxygen uses this value to replace tabs by spaces in code fragments.
183
49TAB_SIZE = 8 184TAB_SIZE = 8
185
186# This tag can be used to specify a number of aliases that acts
187# as commands in the documentation. An alias has the form "name=value".
188# For example adding "sideeffect=\par Side Effects:\n" will allow you to
189# put the command \sideeffect (or @sideeffect) in the documentation, which
190# will result in a user-defined paragraph with heading "Side Effects:".
191# You can put \n's in the value part of an alias to insert newlines.
192
193ALIASES =
194
195# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
196# sources only. Doxygen will then generate output that is more tailored for C.
197# For instance, some of the names that are used will be different. The list
198# of all members will be omitted, etc.
199
200OPTIMIZE_OUTPUT_FOR_C = YES
201
202# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
203# sources only. Doxygen will then generate output that is more tailored for
204# Java. For instance, namespaces will be presented as packages, qualified
205# scopes will look different, etc.
206
207OPTIMIZE_OUTPUT_JAVA = NO
208
209# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
210# sources only. Doxygen will then generate output that is more tailored for
211# Fortran.
212
213OPTIMIZE_FOR_FORTRAN = NO
214
215# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
216# sources. Doxygen will then generate output that is tailored for
217# VHDL.
218
219OPTIMIZE_OUTPUT_VHDL = NO
220
221# Doxygen selects the parser to use depending on the extension of the files it
222# parses. With this tag you can assign which parser to use for a given extension.
223# Doxygen has a built-in mapping, but you can override or extend it using this
224# tag. The format is ext=language, where ext is a file extension, and language
225# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
226# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
227# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
228# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
229# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
230
231EXTENSION_MAPPING =
232
233# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
234# to include (a tag file for) the STL sources as input, then you should
235# set this tag to YES in order to let doxygen match functions declarations and
236# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
237# func(std::string) {}). This also makes the inheritance and collaboration
238# diagrams that involve STL classes more complete and accurate.
239
240BUILTIN_STL_SUPPORT = NO
241
242# If you use Microsoft's C++/CLI language, you should set this option to YES to
243# enable parsing support.
244
245CPP_CLI_SUPPORT = NO
246
247# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
248# Doxygen will parse them like normal C++ but will assume all classes use public
249# instead of private inheritance when no explicit protection keyword is present.
250
251SIP_SUPPORT = NO
252
253# For Microsoft's IDL there are propget and propput attributes to indicate getter
254# and setter methods for a property. Setting this option to YES (the default)
255# will make doxygen replace the get and set methods by a property in the
256# documentation. This will only work if the methods are indeed getting or
257# setting a simple type. If this is not the case, or you want to show the
258# methods anyway, you should set this option to NO.
259
260IDL_PROPERTY_SUPPORT = YES
261
262# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
263# tag is set to YES, then doxygen will reuse the documentation of the first
264# member in the group (if any) for the other members of the group. By default
265# all members of a group must be documented explicitly.
266
267DISTRIBUTE_GROUP_DOC = NO
268
269# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
270# the same type (for instance a group of public functions) to be put as a
271# subgroup of that type (e.g. under the Public Functions section). Set it to
272# NO to prevent subgrouping. Alternatively, this can be done per class using
273# the \nosubgrouping command.
274
275SUBGROUPING = YES
276
277# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
278# is documented as struct, union, or enum with the name of the typedef. So
279# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
280# with name TypeT. When disabled the typedef will appear as a member of a file,
281# namespace, or class. And the struct will be named TypeS. This can typically
282# be useful for C code in case the coding convention dictates that all compound
283# types are typedef'ed and only the typedef is referenced, never the tag name.
284
285TYPEDEF_HIDES_STRUCT = NO
286
287# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
288# determine which symbols to keep in memory and which to flush to disk.
289# When the cache is full, less often used symbols will be written to disk.
290# For small to medium size projects (<1000 input files) the default value is
291# probably good enough. For larger projects a too small cache size can cause
292# doxygen to be busy swapping symbols to and from disk most of the time
293# causing a significant performance penalty.
294# If the system has enough physical memory increasing the cache will improve the
295# performance by keeping more symbols in memory. Note that the value works on
296# a logarithmic scale so increasing the size by one will roughly double the
297# memory usage. The cache size is given by this formula:
298# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
299# corresponding to a cache size of 2^16 = 65536 symbols
300
301SYMBOL_CACHE_SIZE = 0
302
303#---------------------------------------------------------------------------
304# Build related configuration options
305#---------------------------------------------------------------------------
306
307# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
308# documentation are documented, even if no documentation was available.
309# Private class members and static file members will be hidden unless
310# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
311
312EXTRACT_ALL = NO
313
314# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
315# will be included in the documentation.
316
317EXTRACT_PRIVATE = NO
318
319# If the EXTRACT_STATIC tag is set to YES all static members of a file
320# will be included in the documentation.
321
322EXTRACT_STATIC = NO
323
324# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
325# defined locally in source files will be included in the documentation.
326# If set to NO only classes defined in header files are included.
327
328EXTRACT_LOCAL_CLASSES = NO
329
330# This flag is only useful for Objective-C code. When set to YES local
331# methods, which are defined in the implementation section but not in
332# the interface are included in the documentation.
333# If set to NO (the default) only methods in the interface are included.
334
335EXTRACT_LOCAL_METHODS = NO
336
337# If this flag is set to YES, the members of anonymous namespaces will be
338# extracted and appear in the documentation as a namespace called
339# 'anonymous_namespace{file}', where file will be replaced with the base
340# name of the file that contains the anonymous namespace. By default
341# anonymous namespaces are hidden.
342
343EXTRACT_ANON_NSPACES = NO
344
345# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
346# undocumented members of documented classes, files or namespaces.
347# If set to NO (the default) these members will be included in the
348# various overviews, but no documentation section is generated.
349# This option has no effect if EXTRACT_ALL is enabled.
350
351HIDE_UNDOC_MEMBERS = NO
352
353# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
354# undocumented classes that are normally visible in the class hierarchy.
355# If set to NO (the default) these classes will be included in the various
356# overviews. This option has no effect if EXTRACT_ALL is enabled.
357
358HIDE_UNDOC_CLASSES = NO
359
360# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
361# friend (class|struct|union) declarations.
362# If set to NO (the default) these declarations will be included in the
363# documentation.
364
365HIDE_FRIEND_COMPOUNDS = NO
366
367# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
368# documentation blocks found inside the body of a function.
369# If set to NO (the default) these blocks will be appended to the
370# function's detailed documentation block.
371
372HIDE_IN_BODY_DOCS = NO
373
374# The INTERNAL_DOCS tag determines if documentation
375# that is typed after a \internal command is included. If the tag is set
376# to NO (the default) then the documentation will be excluded.
377# Set it to YES to include the internal documentation.
378
379INTERNAL_DOCS = NO
380
381# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
382# file names in lower-case letters. If set to YES upper-case letters are also
383# allowed. This is useful if you have classes or files whose names only differ
384# in case and if your file system supports case sensitive file names. Windows
385# and Mac users are advised to set this option to NO.
386
387CASE_SENSE_NAMES = YES
388
389# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
390# will show members with their full class and namespace scopes in the
391# documentation. If set to YES the scope will be hidden.
392
393HIDE_SCOPE_NAMES = NO
394
395# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
396# will put a list of the files that are included by a file in the documentation
397# of that file.
398
399SHOW_INCLUDE_FILES = NO
400
401# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
402# will list include files with double quotes in the documentation
403# rather than with sharp brackets.
404
405FORCE_LOCAL_INCLUDES = NO
406
407# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
408# is inserted in the documentation for inline members.
409
410INLINE_INFO = YES
411
412# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
413# will sort the (detailed) documentation of file and class members
414# alphabetically by member name. If set to NO the members will appear in
415# declaration order.
416
417SORT_MEMBER_DOCS = NO
418
419# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
420# brief documentation of file, namespace and class members alphabetically
421# by member name. If set to NO (the default) the members will appear in
422# declaration order.
423
424SORT_BRIEF_DOCS = NO
425
426# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
427# will sort the (brief and detailed) documentation of class members so that
428# constructors and destructors are listed first. If set to NO (the default)
429# the constructors will appear in the respective orders defined by
430# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
431# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
432# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
433
434SORT_MEMBERS_CTORS_1ST = NO
435
436# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
437# hierarchy of group names into alphabetical order. If set to NO (the default)
438# the group names will appear in their defined order.
439
440SORT_GROUP_NAMES = NO
441
442# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
443# sorted by fully-qualified names, including namespaces. If set to
444# NO (the default), the class list will be sorted only by class name,
445# not including the namespace part.
446# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
447# Note: This option applies only to the class list, not to the
448# alphabetical list.
449
450SORT_BY_SCOPE_NAME = NO
451
452# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a
453# match between the prototype and the implementation of a member function even if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
454# will still accept a match between prototype and implementation in such cases.
455
456STRICT_PROTO_MATCHING = NO
457
458# The GENERATE_TODOLIST tag can be used to enable (YES) or
459# disable (NO) the todo list. This list is created by putting \todo
460# commands in the documentation.
461
50GENERATE_TODOLIST = YES 462GENERATE_TODOLIST = YES
463
464# The GENERATE_TESTLIST tag can be used to enable (YES) or
465# disable (NO) the test list. This list is created by putting \test
466# commands in the documentation.
467
51GENERATE_TESTLIST = YES 468GENERATE_TESTLIST = YES
469
470# The GENERATE_BUGLIST tag can be used to enable (YES) or
471# disable (NO) the bug list. This list is created by putting \bug
472# commands in the documentation.
473
52GENERATE_BUGLIST = YES 474GENERATE_BUGLIST = YES
475
476# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
477# disable (NO) the deprecated list. This list is created by putting
478# \deprecated commands in the documentation.
479
53GENERATE_DEPRECATEDLIST= YES 480GENERATE_DEPRECATEDLIST= YES
54ALIASES = 481
55ENABLED_SECTIONS = 482# The ENABLED_SECTIONS tag can be used to enable conditional
483# documentation sections, marked by \if sectionname ... \endif.
484
485ENABLED_SECTIONS =
486
487# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
488# the initial value of a variable or macro consists of for it to appear in
489# the documentation. If the initializer consists of more lines than specified
490# here it will be hidden. Use a value of 0 to hide initializers completely.
491# The appearance of the initializer of individual variables and macros in the
492# documentation can be controlled using \showinitializer or \hideinitializer
493# command in the documentation regardless of this setting.
494
56MAX_INITIALIZER_LINES = 30 495MAX_INITIALIZER_LINES = 30
57OPTIMIZE_OUTPUT_FOR_C = YES 496
58OPTIMIZE_OUTPUT_JAVA = NO 497# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
498# at the bottom of the documentation of classes and structs. If set to YES the
499# list will mention the files that were used to generate the documentation.
500
59SHOW_USED_FILES = NO 501SHOW_USED_FILES = NO
502
503# If the sources in your project are distributed over multiple directories
504# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
505# in the documentation. The default is NO.
506
507SHOW_DIRECTORIES = NO
508
509# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
510# This will remove the Files entry from the Quick Index and from the
511# Folder Tree View (if specified). The default is YES.
512
513SHOW_FILES = YES
514
515# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
516# Namespaces page.
517# This will remove the Namespaces entry from the Quick Index
518# and from the Folder Tree View (if specified). The default is YES.
519
520SHOW_NAMESPACES = YES
521
522# The FILE_VERSION_FILTER tag can be used to specify a program or script that
523# doxygen should invoke to get the current version for each file (typically from
524# the version control system). Doxygen will invoke the program by executing (via
525# popen()) the command <command> <input-file>, where <command> is the value of
526# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
527# provided by doxygen. Whatever the program writes to standard output
528# is used as the file version. See the manual for examples.
529
530FILE_VERSION_FILTER =
531
532# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
533# by doxygen. The layout file controls the global structure of the generated
534# output files in an output format independent way. The create the layout file
535# that represents doxygen's defaults, run doxygen with the -l option.
536# You can optionally specify a file name after the option, if omitted
537# DoxygenLayout.xml will be used as the name of the layout file.
538
539LAYOUT_FILE =
540
541#---------------------------------------------------------------------------
542# configuration options related to warning and progress messages
543#---------------------------------------------------------------------------
544
545# The QUIET tag can be used to turn on/off the messages that are generated
546# by doxygen. Possible values are YES and NO. If left blank NO is used.
547
60QUIET = NO 548QUIET = NO
549
550# The WARNINGS tag can be used to turn on/off the warning messages that are
551# generated by doxygen. Possible values are YES and NO. If left blank
552# NO is used.
553
61WARNINGS = YES 554WARNINGS = YES
555
556# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
557# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
558# automatically be disabled.
559
62WARN_IF_UNDOCUMENTED = YES 560WARN_IF_UNDOCUMENTED = YES
561
562# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
563# potential errors in the documentation, such as not documenting some
564# parameters in a documented function, or documenting parameters that
565# don't exist or using markup commands wrongly.
566
567WARN_IF_DOC_ERROR = YES
568
569# The WARN_NO_PARAMDOC option can be enabled to get warnings for
570# functions that are documented, but have no documentation for their parameters
571# or return value. If set to NO (the default) doxygen will only warn about
572# wrong or incomplete parameter documentation, but not about the absence of
573# documentation.
574
575WARN_NO_PARAMDOC = YES
576
577# The WARN_FORMAT tag determines the format of the warning messages that
578# doxygen can produce. The string should contain the $file, $line, and $text
579# tags, which will be replaced by the file and line number from which the
580# warning originated and the warning text. Optionally the format may contain
581# $version, which will be replaced by the version of the file (if it could
582# be obtained via FILE_VERSION_FILTER)
583
63WARN_FORMAT = "$file:$line: $text" 584WARN_FORMAT = "$file:$line: $text"
64WARN_LOGFILE = 585
65FILE_PATTERNS = 586# The WARN_LOGFILE tag can be used to specify a file to which warning
66RECURSIVE = NO 587# and error messages should be written. If left blank the output is written
67EXCLUDE = 588# to stderr.
589
590WARN_LOGFILE =
591
592#---------------------------------------------------------------------------
593# configuration options related to the input files
594#---------------------------------------------------------------------------
595
596# The INPUT tag can be used to specify the files and/or directories that contain
597# documented source files. You may enter file names like "myfile.cpp" or
598# directories like "/usr/src/myproject". Separate the files or directories
599# with spaces.
600
601INPUT = @builddir@/eet.dox \
602 @srcdir@/examples.dox \
603 @top_srcdir@/src/lib
604
605# This tag can be used to specify the character encoding of the source files
606# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
607# also the default input encoding. Doxygen uses libiconv (or the iconv built
608# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
609# the list of possible encodings.
610
611INPUT_ENCODING = UTF-8
612
613# If the value of the INPUT tag contains directories, you can use the
614# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
615# and *.h) to filter out the source-files in the directories. If left
616# blank the following patterns are tested:
617# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
618# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
619# *.f90 *.f *.for *.vhd *.vhdl
620
621FILE_PATTERNS = *.c \
622 *.h
623
624# The RECURSIVE tag can be used to turn specify whether or not subdirectories
625# should be searched for input files as well. Possible values are YES and NO.
626# If left blank NO is used.
627
628RECURSIVE = YES
629
630# The EXCLUDE tag can be used to specify files and/or directories that should
631# excluded from the INPUT source files. This way you can easily exclude a
632# subdirectory from a directory tree whose root is specified with the INPUT tag.
633
634EXCLUDE = @top_builddir@/src/lib/eet_amalgamation.c
635
636# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
637# directories that are symbolic links (a Unix file system feature) are excluded
638# from the input.
639
68EXCLUDE_SYMLINKS = NO 640EXCLUDE_SYMLINKS = NO
69EXCLUDE_PATTERNS = 641
70EXAMPLE_PATH = @top_srcdir@/src/examples/ 642# If the value of the INPUT tag contains directories, you can use the
71EXAMPLE_PATTERNS = 643# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
644# certain files from those directories. Note that the wildcards are matched
645# against the file with absolute path, so to exclude all test directories
646# for example use the pattern */test/*
647
648EXCLUDE_PATTERNS =
649
650# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
651# (namespaces, classes, functions, etc.) that should be excluded from the
652# output. The symbol name can be a fully qualified name, a word, or if the
653# wildcard * is used, a substring. Examples: ANamespace, AClass,
654# AClass::ANamespace, ANamespace::*Test
655
656EXCLUDE_SYMBOLS =
657
658# The EXAMPLE_PATH tag can be used to specify one or more files or
659# directories that contain example code fragments that are included (see
660# the \include command).
661
662EXAMPLE_PATH = @top_srcdir@/src/examples
663
664# If the value of the EXAMPLE_PATH tag contains directories, you can use the
665# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
666# and *.h) to filter out the source-files in the directories. If left
667# blank all files are included.
668
669EXAMPLE_PATTERNS = *.c,*.h,*.x
670
671# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
672# searched for input files to be used with the \include or \dontinclude
673# commands irrespective of the value of the RECURSIVE tag.
674# Possible values are YES and NO. If left blank NO is used.
675
72EXAMPLE_RECURSIVE = NO 676EXAMPLE_RECURSIVE = NO
73INPUT_FILTER = 677
678# The IMAGE_PATH tag can be used to specify one or more files or
679# directories that contain image that are included in the documentation (see
680# the \image command).
681
682IMAGE_PATH = @top_srcdir@/doc/img
683
684# The INPUT_FILTER tag can be used to specify a program that doxygen should
685# invoke to filter for each input file. Doxygen will invoke the filter program
686# by executing (via popen()) the command <filter> <input-file>, where <filter>
687# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
688# input file. Doxygen will then use the output that the filter program writes
689# to standard output.
690# If FILTER_PATTERNS is specified, this tag will be
691# ignored.
692
693INPUT_FILTER =
694
695# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
696# basis.
697# Doxygen will compare the file name with each pattern and apply the
698# filter if there is a match.
699# The filters are a list of the form:
700# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
701# info on how filters are used. If FILTER_PATTERNS is empty or if
702# non of the patterns match the file name, INPUT_FILTER is applied.
703
704FILTER_PATTERNS =
705
706# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
707# INPUT_FILTER) will be used to filter the input files when producing source
708# files to browse (i.e. when SOURCE_BROWSER is set to YES).
709
74FILTER_SOURCE_FILES = NO 710FILTER_SOURCE_FILES = NO
711
712# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
713# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
714# and it is also possible to disable source filtering for a specific pattern
715# using *.ext= (so without naming a filter). This option only has effect when
716# FILTER_SOURCE_FILES is enabled.
717
718FILTER_SOURCE_PATTERNS =
719
720#---------------------------------------------------------------------------
721# configuration options related to source browsing
722#---------------------------------------------------------------------------
723
724# If the SOURCE_BROWSER tag is set to YES then a list of source files will
725# be generated. Documented entities will be cross-referenced with these sources.
726# Note: To get rid of all source code in the generated output, make sure also
727# VERBATIM_HEADERS is set to NO.
728
75SOURCE_BROWSER = NO 729SOURCE_BROWSER = NO
730
731# Setting the INLINE_SOURCES tag to YES will include the body
732# of functions and classes directly in the documentation.
733
76INLINE_SOURCES = NO 734INLINE_SOURCES = NO
735
736# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
737# doxygen to hide any special comment blocks from generated source code
738# fragments. Normal C and C++ comments will always remain visible.
739
740STRIP_CODE_COMMENTS = YES
741
742# If the REFERENCED_BY_RELATION tag is set to YES
743# then for each documented function all documented
744# functions referencing it will be listed.
745
77REFERENCED_BY_RELATION = YES 746REFERENCED_BY_RELATION = YES
747
748# If the REFERENCES_RELATION tag is set to YES
749# then for each documented function all documented entities
750# called/used by that function will be listed.
751
78REFERENCES_RELATION = YES 752REFERENCES_RELATION = YES
753
754# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
755# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
756# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
757# link to the source code.
758# Otherwise they will link to the documentation.
759
760REFERENCES_LINK_SOURCE = YES
761
762# If the USE_HTAGS tag is set to YES then the references to source code
763# will point to the HTML generated by the htags(1) tool instead of doxygen
764# built-in source browser. The htags tool is part of GNU's global source
765# tagging system (see http://www.gnu.org/software/global/global.html). You
766# will need version 4.8.6 or higher.
767
768USE_HTAGS = NO
769
770# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
771# will generate a verbatim copy of the header file for each class for
772# which an include is specified. Set to NO to disable this.
773
774VERBATIM_HEADERS = NO
775
776#---------------------------------------------------------------------------
777# configuration options related to the alphabetical class index
778#---------------------------------------------------------------------------
779
780# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
781# of all compounds will be generated. Enable this if the project
782# contains a lot of classes, structs, unions or interfaces.
783
79ALPHABETICAL_INDEX = YES 784ALPHABETICAL_INDEX = YES
785
786# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
787# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
788# in which this list will be split (can be a number in the range [1..20])
789
80COLS_IN_ALPHA_INDEX = 2 790COLS_IN_ALPHA_INDEX = 2
81IGNORE_PREFIX = eet_ _eet_ Eet_ _Eet_ EET_ _EET_ 791
792# In case all classes in a project start with a common prefix, all
793# classes will be put under the same header in the alphabetical index.
794# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
795# should be ignored while generating the index headers.
796
797IGNORE_PREFIX = eet_ \
798 _eet_ \
799 Eet_ \
800 _Eet_ \
801 EET_ \
802 _EET_
803
804#---------------------------------------------------------------------------
805# configuration options related to the HTML output
806#---------------------------------------------------------------------------
807
808# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
809# generate HTML output.
810
811GENERATE_HTML = YES
812
813# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
814# If a relative path is entered the value of OUTPUT_DIRECTORY will be
815# put in front of it. If left blank `html' will be used as the default path.
816
817HTML_OUTPUT = html
818
819# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
820# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
821# doxygen will generate files with .html extension.
822
823HTML_FILE_EXTENSION = .html
824
825# The HTML_HEADER tag can be used to specify a personal HTML header for
826# each generated HTML page. If it is left blank doxygen will generate a
827# standard header.
828
829HTML_HEADER = @srcdir@/head.html
830
831# The HTML_FOOTER tag can be used to specify a personal HTML footer for
832# each generated HTML page. If it is left blank doxygen will generate a
833# standard footer.
834
835HTML_FOOTER = @srcdir@/foot.html
836
837# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
838# style sheet that is used by each HTML page. It can be used to
839# fine-tune the look of the HTML output. If the tag is left blank doxygen
840# will generate a default style sheet. Note that doxygen will try to copy
841# the style sheet file to the HTML output directory, so don't put your own
842# stylesheet in the HTML output directory as well, or it will be erased!
843
844HTML_STYLESHEET = @srcdir@/e.css
845
846# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
847# Doxygen will adjust the colors in the stylesheet and background images
848# according to this color. Hue is specified as an angle on a colorwheel,
849# see http://en.wikipedia.org/wiki/Hue for more information.
850# For instance the value 0 represents red, 60 is yellow, 120 is green,
851# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
852# The allowed range is 0 to 359.
853
854HTML_COLORSTYLE_HUE = 220
855
856# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
857# the colors in the HTML output. For a value of 0 the output will use
858# grayscales only. A value of 255 will produce the most vivid colors.
859
860HTML_COLORSTYLE_SAT = 100
861
862# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
863# the luminance component of the colors in the HTML output. Values below
864# 100 gradually make the output lighter, whereas values above 100 make
865# the output darker. The value divided by 100 is the actual gamma applied,
866# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
867# and 100 does not change the gamma.
868
869HTML_COLORSTYLE_GAMMA = 80
870
871# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
872# page will contain the date and time when the page was generated. Setting
873# this to NO can help when comparing the output of multiple runs.
874
875HTML_TIMESTAMP = YES
876
877# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
878# files or namespaces will be aligned in HTML using tables. If set to
879# NO a bullet list will be used.
880
881HTML_ALIGN_MEMBERS = YES
882
883# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
884# documentation will contain sections that can be hidden and shown after the
885# page has loaded. For this to work a browser that supports
886# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
887# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
888
889HTML_DYNAMIC_SECTIONS = YES
890
891# If the GENERATE_DOCSET tag is set to YES, additional index files
892# will be generated that can be used as input for Apple's Xcode 3
893# integrated development environment, introduced with OSX 10.5 (Leopard).
894# To create a documentation set, doxygen will generate a Makefile in the
895# HTML output directory. Running make will produce the docset in that
896# directory and running "make install" will install the docset in
897# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
898# it at startup.
899# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
900# for more information.
901
902GENERATE_DOCSET = YES
903
904# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
905# feed. A documentation feed provides an umbrella under which multiple
906# documentation sets from a single provider (such as a company or product suite)
907# can be grouped.
908
909DOCSET_FEEDNAME = "Doxygen generated docs"
910
911# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
912# should uniquely identify the documentation set bundle. This should be a
913# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
914# will append .docset to the name.
915
916DOCSET_BUNDLE_ID = org.enlightenment.Eet
917
918# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
919# the documentation publisher. This should be a reverse domain-name style
920# string, e.g. com.mycompany.MyDocSet.documentation.
921
922DOCSET_PUBLISHER_ID = org.enlightenment.Eet
923
924# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
925
926DOCSET_PUBLISHER_NAME = Enlightenment
927
928# If the GENERATE_HTMLHELP tag is set to YES, additional index files
929# will be generated that can be used as input for tools like the
930# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
931# of the generated HTML documentation.
932
933GENERATE_HTMLHELP = YES
934
935# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
936# be used to specify the file name of the resulting .chm file. You
937# can add a path in front of the file if the result should not be
938# written to the html output directory.
939
940CHM_FILE =
941
942# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
943# be used to specify the location (absolute path including file name) of
944# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
945# the HTML help compiler on the generated index.hhp.
946
947HHC_LOCATION =
948
949# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
950# controls if a separate .chi index file is generated (YES) or that
951# it should be included in the master .chm file (NO).
952
953GENERATE_CHI = NO
954
955# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
956# is used to encode HtmlHelp index (hhk), content (hhc) and project file
957# content.
958
959CHM_INDEX_ENCODING =
960
961# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
962# controls whether a binary table of contents is generated (YES) or a
963# normal table of contents (NO) in the .chm file.
964
965BINARY_TOC = NO
966
967# The TOC_EXPAND flag can be set to YES to add extra items for group members
968# to the contents of the HTML help documentation and to the tree view.
969
970TOC_EXPAND = NO
971
972# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
973# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
974# that can be used as input for Qt's qhelpgenerator to generate a
975# Qt Compressed Help (.qch) of the generated HTML documentation.
976
977GENERATE_QHP = NO
978
979# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
980# be used to specify the file name of the resulting .qch file.
981# The path specified is relative to the HTML output folder.
982
983QCH_FILE =
984
985# The QHP_NAMESPACE tag specifies the namespace to use when generating
986# Qt Help Project output. For more information please see
987# http://doc.trolltech.com/qthelpproject.html#namespace
988
989QHP_NAMESPACE = org.enlightenment.Eet
990
991# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
992# Qt Help Project output. For more information please see
993# http://doc.trolltech.com/qthelpproject.html#virtual-folders
994
995QHP_VIRTUAL_FOLDER = doc
996
997# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
998# add. For more information please see
999# http://doc.trolltech.com/qthelpproject.html#custom-filters
1000
1001QHP_CUST_FILTER_NAME =
1002
1003# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
1004# custom filter to add. For more information please see
1005# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
1006# Qt Help Project / Custom Filters</a>.
1007
1008QHP_CUST_FILTER_ATTRS =
1009
1010# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
1011# project's
1012# filter section matches.
1013# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
1014# Qt Help Project / Filter Attributes</a>.
1015
1016QHP_SECT_FILTER_ATTRS =
1017
1018# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
1019# be used to specify the location of Qt's qhelpgenerator.
1020# If non-empty doxygen will try to run qhelpgenerator on the generated
1021# .qhp file.
1022
1023QHG_LOCATION =
1024
1025# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
1026# will be generated, which together with the HTML files, form an Eclipse help
1027# plugin. To install this plugin and make it available under the help contents
1028# menu in Eclipse, the contents of the directory containing the HTML and XML
1029# files needs to be copied into the plugins directory of eclipse. The name of
1030# the directory within the plugins directory should be the same as
1031# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
1032# the help appears.
1033
1034GENERATE_ECLIPSEHELP = NO
1035
1036# A unique identifier for the eclipse help plugin. When installing the plugin
1037# the directory name containing the HTML and XML files should also have
1038# this name.
1039
1040ECLIPSE_DOC_ID = org.enlightenment.Eet
1041
1042# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
1043# top of each HTML page. The value NO (the default) enables the index and
1044# the value YES disables it.
1045
1046DISABLE_INDEX = YES
1047
1048# This tag can be used to set the number of enum values (range [0,1..20])
1049# that doxygen will group on one line in the generated HTML documentation.
1050# Note that a value of 0 will completely suppress the enum values from appearing in the overview section.
1051
1052ENUM_VALUES_PER_LINE = 1
1053
1054# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
1055# structure should be generated to display hierarchical information.
1056# If the tag value is set to YES, a side panel will be generated
1057# containing a tree-like index structure (just like the one that
1058# is generated for HTML Help). For this to work a browser that supports
1059# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
1060# Windows users are probably better off using the HTML help feature.
1061
82GENERATE_TREEVIEW = NO 1062GENERATE_TREEVIEW = NO
1063
1064# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
1065# and Class Hierarchy pages using a tree view instead of an ordered list.
1066
1067USE_INLINE_TREES = NO
1068
1069# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
1070# used to set the initial width (in pixels) of the frame in which the tree
1071# is shown.
1072
83TREEVIEW_WIDTH = 250 1073TREEVIEW_WIDTH = 250
1074
1075# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
1076# links to external symbols imported via tag files in a separate window.
1077
1078EXT_LINKS_IN_WINDOW = NO
1079
1080# Use this tag to change the font size of Latex formulas included
1081# as images in the HTML documentation. The default is 10. Note that
1082# when you change the font size after a successful doxygen run you need
1083# to manually remove any form_*.png images from the HTML output directory
1084# to force them to be regenerated.
1085
1086FORMULA_FONTSIZE = 10
1087
1088# Use the FORMULA_TRANPARENT tag to determine whether or not the images
1089# generated for formulas are transparent PNGs. Transparent PNGs are
1090# not supported properly for IE 6.0, but are supported on all modern browsers.
1091# Note that when changing this option you need to delete any form_*.png files
1092# in the HTML output before the changes have effect.
1093
1094FORMULA_TRANSPARENT = YES
1095
1096# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
1097# (see http://www.mathjax.org) which uses client side Javascript for the
1098# rendering instead of using prerendered bitmaps. Use this if you do not
1099# have LaTeX installed or if you want to formulas look prettier in the HTML
1100# output. When enabled you also need to install MathJax separately and
1101# configure the path to it using the MATHJAX_RELPATH option.
1102
1103USE_MATHJAX = NO
1104
1105# When MathJax is enabled you need to specify the location relative to the
1106# HTML output directory using the MATHJAX_RELPATH option. The destination
1107# directory should contain the MathJax.js script. For instance, if the mathjax
1108# directory is located at the same level as the HTML output directory, then
1109# MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing
1110# MathJax, but it is strongly recommended to install a local copy of MathJax
1111# before deployment.
1112
1113MATHJAX_RELPATH = http://www.mathjax.org/mathjax
1114
1115# When the SEARCHENGINE tag is enabled doxygen will generate a search box
1116# for the HTML output. The underlying search engine uses javascript
1117# and DHTML and should work on any modern browser. Note that when using
1118# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
1119# (GENERATE_DOCSET) there is already a search function so this one should
1120# typically be disabled. For large projects the javascript based search engine
1121# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
1122
1123SEARCHENGINE = NO
1124
1125# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
1126# implemented using a PHP enabled web server instead of at the web client
1127# using Javascript. Doxygen will generate the search PHP script and index
1128# file to put on the web server. The advantage of the server
1129# based approach is that it scales better to large projects and allows
1130# full text search. The disadvantages are that it is more difficult to setup
1131# and does not have live searching capabilities.
1132
1133SERVER_BASED_SEARCH = NO
1134
1135#---------------------------------------------------------------------------
1136# configuration options related to the LaTeX output
1137#---------------------------------------------------------------------------
1138
1139# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
1140# generate Latex output.
1141
84GENERATE_LATEX = YES 1142GENERATE_LATEX = YES
1143
1144# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
1145# If a relative path is entered the value of OUTPUT_DIRECTORY will be
1146# put in front of it. If left blank `latex' will be used as the default path.
1147
85LATEX_OUTPUT = latex 1148LATEX_OUTPUT = latex
1149
1150# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
1151# invoked. If left blank `latex' will be used as the default command name.
1152# Note that when enabling USE_PDFLATEX this option is only used for
1153# generating bitmaps for formulas in the HTML output, but not in the
1154# Makefile that is written to the output directory.
1155
86LATEX_CMD_NAME = latex 1156LATEX_CMD_NAME = latex
1157
1158# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
1159# generate index for LaTeX. If left blank `makeindex' will be used as the
1160# default command name.
1161
87MAKEINDEX_CMD_NAME = makeindex 1162MAKEINDEX_CMD_NAME = makeindex
1163
1164# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
1165# LaTeX documents. This may be useful for small projects and may help to
1166# save some trees in general.
1167
88COMPACT_LATEX = NO 1168COMPACT_LATEX = NO
1169
1170# The PAPER_TYPE tag can be used to set the paper type that is used
1171# by the printer. Possible values are: a4, letter, legal and
1172# executive. If left blank a4wide will be used.
1173
89PAPER_TYPE = a4wide 1174PAPER_TYPE = a4wide
90EXTRA_PACKAGES = 1175
91LATEX_HEADER = 1176# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
1177# packages that should be included in the LaTeX output.
1178
1179EXTRA_PACKAGES =
1180
1181# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
1182# the generated latex document. The header should contain everything until
1183# the first chapter. If it is left blank doxygen will generate a
1184# standard header. Notice: only use this tag if you know what you are doing!
1185
1186LATEX_HEADER =
1187
1188# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
1189# is prepared for conversion to pdf (using ps2pdf). The pdf file will
1190# contain links (just like the HTML output) instead of page references
1191# This makes the output suitable for online browsing using a pdf viewer.
1192
92PDF_HYPERLINKS = YES 1193PDF_HYPERLINKS = YES
1194
1195# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
1196# plain latex in the generated Makefile. Set this option to YES to get a
1197# higher quality PDF documentation.
1198
93USE_PDFLATEX = YES 1199USE_PDFLATEX = YES
1200
1201# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
1202# command to the generated LaTeX files. This will instruct LaTeX to keep
1203# running if errors occur, instead of asking the user for help.
1204# This option is also used when generating formulas in HTML.
1205
94LATEX_BATCHMODE = NO 1206LATEX_BATCHMODE = NO
1207
1208# If LATEX_HIDE_INDICES is set to YES then doxygen will not
1209# include the index chapters (such as File Index, Compound Index, etc.)
1210# in the output.
1211
1212LATEX_HIDE_INDICES = NO
1213
1214# If LATEX_SOURCE_CODE is set to YES then doxygen will include
1215# source code with syntax highlighting in the LaTeX output.
1216# Note that which sources are shown also depends on other settings
1217# such as SOURCE_BROWSER.
1218
1219LATEX_SOURCE_CODE = NO
1220
1221#---------------------------------------------------------------------------
1222# configuration options related to the RTF output
1223#---------------------------------------------------------------------------
1224
1225# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
1226# The RTF output is optimized for Word 97 and may not look very pretty with
1227# other RTF readers or editors.
1228
95GENERATE_RTF = NO 1229GENERATE_RTF = NO
1230
1231# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
1232# If a relative path is entered the value of OUTPUT_DIRECTORY will be
1233# put in front of it. If left blank `rtf' will be used as the default path.
1234
96RTF_OUTPUT = rtf 1235RTF_OUTPUT = rtf
1236
1237# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
1238# RTF documents. This may be useful for small projects and may help to
1239# save some trees in general.
1240
97COMPACT_RTF = NO 1241COMPACT_RTF = NO
1242
1243# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
1244# will contain hyperlink fields. The RTF file will
1245# contain links (just like the HTML output) instead of page references.
1246# This makes the output suitable for online browsing using WORD or other
1247# programs which support those fields.
1248# Note: wordpad (write) and others do not support links.
1249
98RTF_HYPERLINKS = NO 1250RTF_HYPERLINKS = NO
99RTF_STYLESHEET_FILE = 1251
100RTF_EXTENSIONS_FILE = 1252# Load stylesheet definitions from file. Syntax is similar to doxygen's
1253# config file, i.e. a series of assignments. You only have to provide
1254# replacements, missing definitions are set to their default value.
1255
1256RTF_STYLESHEET_FILE =
1257
1258# Set optional variables used in the generation of an rtf document.
1259# Syntax is similar to doxygen's config file.
1260
1261RTF_EXTENSIONS_FILE =
1262
1263#---------------------------------------------------------------------------
1264# configuration options related to the man page output
1265#---------------------------------------------------------------------------
1266
1267# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
1268# generate man pages
1269
101GENERATE_MAN = YES 1270GENERATE_MAN = YES
1271
1272# The MAN_OUTPUT tag is used to specify where the man pages will be put.
1273# If a relative path is entered the value of OUTPUT_DIRECTORY will be
1274# put in front of it. If left blank `man' will be used as the default path.
1275
102MAN_OUTPUT = man 1276MAN_OUTPUT = man
1277
1278# The MAN_EXTENSION tag determines the extension that is added to
1279# the generated man pages (default is the subroutine's section .3)
1280
103MAN_EXTENSION = .3 1281MAN_EXTENSION = .3
1282
1283# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
1284# then it will generate one additional man file for each entity
1285# documented in the real man page(s). These additional files
1286# only source the real man page, but without them the man command
1287# would be unable to find the correct page. The default is NO.
1288
104MAN_LINKS = YES 1289MAN_LINKS = YES
1290
1291#---------------------------------------------------------------------------
1292# configuration options related to the XML output
1293#---------------------------------------------------------------------------
1294
1295# If the GENERATE_XML tag is set to YES Doxygen will
1296# generate an XML file that captures the structure of
1297# the code including all documentation.
1298
105GENERATE_XML = NO 1299GENERATE_XML = NO
106XML_SCHEMA = 1300
107XML_DTD = 1301# The XML_OUTPUT tag is used to specify where the XML pages will be put.
1302# If a relative path is entered the value of OUTPUT_DIRECTORY will be
1303# put in front of it. If left blank `xml' will be used as the default path.
1304
1305XML_OUTPUT = xml
1306
1307# The XML_SCHEMA tag can be used to specify an XML schema,
1308# which can be used by a validating XML parser to check the
1309# syntax of the XML files.
1310
1311XML_SCHEMA =
1312
1313# The XML_DTD tag can be used to specify an XML DTD,
1314# which can be used by a validating XML parser to check the
1315# syntax of the XML files.
1316
1317XML_DTD =
1318
1319# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
1320# dump the program listings (including syntax highlighting
1321# and cross-referencing information) to the XML output. Note that
1322# enabling this will significantly increase the size of the XML output.
1323
1324XML_PROGRAMLISTING = YES
1325
1326#---------------------------------------------------------------------------
1327# configuration options for the AutoGen Definitions output
1328#---------------------------------------------------------------------------
1329
1330# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
1331# generate an AutoGen Definitions (see autogen.sf.net) file
1332# that captures the structure of the code including all
1333# documentation. Note that this feature is still experimental
1334# and incomplete at the moment.
1335
108GENERATE_AUTOGEN_DEF = NO 1336GENERATE_AUTOGEN_DEF = NO
1337
1338#---------------------------------------------------------------------------
1339# configuration options related to the Perl module output
1340#---------------------------------------------------------------------------
1341
1342# If the GENERATE_PERLMOD tag is set to YES Doxygen will
1343# generate a Perl module file that captures the structure of
1344# the code including all documentation. Note that this
1345# feature is still experimental and incomplete at the
1346# moment.
1347
1348GENERATE_PERLMOD = NO
1349
1350# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
1351# the necessary Makefile rules, Perl scripts and LaTeX code to be able
1352# to generate PDF and DVI output from the Perl module output.
1353
1354PERLMOD_LATEX = NO
1355
1356# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
1357# nicely formatted so it can be parsed by a human reader.
1358# This is useful
1359# if you want to understand what is going on.
1360# On the other hand, if this
1361# tag is set to NO the size of the Perl module output will be much smaller
1362# and Perl will parse it just the same.
1363
1364PERLMOD_PRETTY = YES
1365
1366# The names of the make variables in the generated doxyrules.make file
1367# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
1368# This is useful so different doxyrules.make files included by the same
1369# Makefile don't overwrite each other's variables.
1370
1371PERLMOD_MAKEVAR_PREFIX =
1372
1373#---------------------------------------------------------------------------
1374# Configuration options related to the preprocessor
1375#---------------------------------------------------------------------------
1376
1377# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
1378# evaluate all C-preprocessor directives found in the sources and include
1379# files.
1380
109ENABLE_PREPROCESSING = YES 1381ENABLE_PREPROCESSING = YES
110MACRO_EXPANSION = NO 1382
111EXPAND_ONLY_PREDEF = NO 1383# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
1384# names in the source code. If set to NO (the default) only conditional
1385# compilation will be performed. Macro expansion can be done in a controlled
1386# way by setting EXPAND_ONLY_PREDEF to YES.
1387
1388MACRO_EXPANSION = YES
1389
1390# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
1391# then the macro expansion is limited to the macros specified with the
1392# PREDEFINED and EXPAND_AS_DEFINED tags.
1393
1394EXPAND_ONLY_PREDEF = YES
1395
1396# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
1397# in the INCLUDE_PATH (see below) will be search if a #include is found.
1398
112SEARCH_INCLUDES = NO 1399SEARCH_INCLUDES = NO
1400
1401# The INCLUDE_PATH tag can be used to specify one or more directories that
1402# contain include files that are not input files but should be processed by
1403# the preprocessor.
1404
113INCLUDE_PATH = 1405INCLUDE_PATH =
114INCLUDE_FILE_PATTERNS = 1406
115PREDEFINED = 1407# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
116EXPAND_AS_DEFINED = 1408# patterns (like *.h and *.hpp) to filter out the header-files in the
1409# directories. If left blank, the patterns specified with FILE_PATTERNS will
1410# be used.
1411
1412INCLUDE_FILE_PATTERNS =
1413
1414# The PREDEFINED tag can be used to specify one or more macro names that
1415# are defined before the preprocessor is started (similar to the -D option of
1416# gcc). The argument of the tag is a list of macros of the form: name
1417# or name=definition (no spaces). If the definition and the = are
1418# omitted =1 is assumed. To prevent a macro definition from being
1419# undefined via #undef or recursively expanded use the := operator
1420# instead of the = operator.
1421
1422PREDEFINED = EINA_MAGIC_DEBUG \
1423 __UNUSED__= \
1424 EINA_ARG_NONNULL()= \
1425 EINA_MALLOC= \
1426 EINA_WARN_UNUSED_RESULT= \
1427 EAPI= \
1428 EINA_PURE= \
1429 EINA_CONST=
1430
1431# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
1432# this tag can be used to specify a list of macro names that should be expanded.
1433# The macro definition that is found in the sources will be used.
1434# Use the PREDEFINED tag if you want to use a different macro definition that overrules the definition found in the source code.
1435
1436EXPAND_AS_DEFINED =
1437
1438# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
1439# doxygen's preprocessor will remove all references to function-like macros
1440# that are alone on a line, have an all uppercase name, and do not end with a
1441# semicolon, because these will confuse the parser if not removed.
1442
117SKIP_FUNCTION_MACROS = YES 1443SKIP_FUNCTION_MACROS = YES
118TAGFILES = 1444
119GENERATE_TAGFILE = 1445#---------------------------------------------------------------------------
1446# Configuration::additions related to external references
1447#---------------------------------------------------------------------------
1448
1449# The TAGFILES option can be used to specify one or more tagfiles.
1450# Optionally an initial location of the external documentation
1451# can be added for each tagfile. The format of a tag file without
1452# this location is as follows:
1453#
1454# TAGFILES = file1 file2 ...
1455# Adding location for the tag files is done as follows:
1456#
1457# TAGFILES = file1=loc1 "file2 = loc2" ...
1458# where "loc1" and "loc2" can be relative or absolute paths or
1459# URLs. If a location is present for each tag, the installdox tool
1460# does not have to be run to correct the links.
1461# Note that each tag file must have a unique name
1462# (where the name does NOT include the path)
1463# If a tag file is not located in the directory in which doxygen
1464# is run, you must also specify the path to the tagfile here.
1465
1466TAGFILES =
1467
1468# When a file name is specified after GENERATE_TAGFILE, doxygen will create
1469# a tag file that is based on the input files it reads.
1470
1471GENERATE_TAGFILE =
1472
1473# If the ALLEXTERNALS tag is set to YES all external classes will be listed
1474# in the class index. If set to NO only the inherited external classes
1475# will be listed.
1476
120ALLEXTERNALS = NO 1477ALLEXTERNALS = NO
1478
1479# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
1480# in the modules index. If set to NO, only the current project's groups will
1481# be listed.
1482
121EXTERNAL_GROUPS = YES 1483EXTERNAL_GROUPS = YES
1484
1485# The PERL_PATH should be the absolute path and name of the perl script
1486# interpreter (i.e. the result of `which perl').
1487
122PERL_PATH = /usr/bin/perl 1488PERL_PATH = /usr/bin/perl
1489
1490#---------------------------------------------------------------------------
1491# Configuration options related to the dot tool
1492#---------------------------------------------------------------------------
1493
1494# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
1495# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
1496# or super classes. Setting the tag to NO turns the diagrams off. Note that
1497# this option also works with HAVE_DOT disabled, but it is recommended to
1498# install and use dot, since it yields more powerful graphs.
1499
123CLASS_DIAGRAMS = NO 1500CLASS_DIAGRAMS = NO
1501
1502# You can define message sequence charts within doxygen comments using the \msc
1503# command. Doxygen will then run the mscgen tool (see
1504# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
1505# documentation. The MSCGEN_PATH tag allows you to specify the directory where
1506# the mscgen tool resides. If left empty the tool is assumed to be found in the
1507# default search path.
1508
1509MSCGEN_PATH =
1510
1511# If set to YES, the inheritance and collaboration graphs will hide
1512# inheritance and usage relations if the target is undocumented
1513# or is not a class.
1514
124HIDE_UNDOC_RELATIONS = YES 1515HIDE_UNDOC_RELATIONS = YES
1516
1517# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
1518# available from the path. This tool is part of Graphviz, a graph visualization
1519# toolkit from AT&T and Lucent Bell Labs. The other options in this section
1520# have no effect if this option is set to NO (the default)
1521
125HAVE_DOT = NO 1522HAVE_DOT = NO
1523
1524# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
1525# allowed to run in parallel. When set to 0 (the default) doxygen will
1526# base this on the number of processors available in the system. You can set it
1527# explicitly to a value larger than 0 to get control over the balance
1528# between CPU load and processing speed.
1529
1530DOT_NUM_THREADS = 0
1531
1532# By default doxygen will write a font called Helvetica to the output
1533# directory and reference it in all dot files that doxygen generates.
1534# When you want a differently looking font you can specify the font name
1535# using DOT_FONTNAME. You need to make sure dot is able to find the font,
1536# which can be done by putting it in a standard location or by setting the
1537# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
1538# containing the font.
1539
1540DOT_FONTNAME = Helvetica
1541
1542# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
1543# The default size is 10pt.
1544
1545DOT_FONTSIZE = 10
1546
1547# By default doxygen will tell dot to use the output directory to look for the
1548# FreeSans.ttf font (which doxygen will put there itself). If you specify a
1549# different font using DOT_FONTNAME you can set the path where dot
1550# can find it using this tag.
1551
1552DOT_FONTPATH =
1553
1554# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
1555# will generate a graph for each documented class showing the direct and
1556# indirect inheritance relations. Setting this tag to YES will force the
1557# the CLASS_DIAGRAMS tag to NO.
1558
126CLASS_GRAPH = NO 1559CLASS_GRAPH = NO
1560
1561# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
1562# will generate a graph for each documented class showing the direct and
1563# indirect implementation dependencies (inheritance, containment, and
1564# class references variables) of the class with other documented classes.
1565
127COLLABORATION_GRAPH = NO 1566COLLABORATION_GRAPH = NO
1567
1568# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
1569# will generate a graph for groups, showing the direct groups dependencies
1570
1571GROUP_GRAPHS = YES
1572
1573# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
1574# collaboration diagrams in a style similar to the OMG's Unified Modeling
1575# Language.
1576
1577UML_LOOK = NO
1578
1579# If set to YES, the inheritance and collaboration graphs will show the
1580# relations between templates and their instances.
1581
128TEMPLATE_RELATIONS = NO 1582TEMPLATE_RELATIONS = NO
1583
1584# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
1585# tags are set to YES then doxygen will generate a graph for each documented
1586# file showing the direct and indirect include dependencies of the file with
1587# other documented files.
1588
129INCLUDE_GRAPH = NO 1589INCLUDE_GRAPH = NO
1590
1591# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
1592# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
1593# documented header file showing the documented files that directly or
1594# indirectly include this file.
1595
130INCLUDED_BY_GRAPH = NO 1596INCLUDED_BY_GRAPH = NO
1597
1598# If the CALL_GRAPH and HAVE_DOT options are set to YES then
1599# doxygen will generate a call dependency graph for every global function
1600# or class method. Note that enabling this option will significantly increase
1601# the time of a run. So in most cases it will be better to enable call graphs
1602# for selected functions only using the \callgraph command.
1603
1604CALL_GRAPH = NO
1605
1606# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
1607# doxygen will generate a caller dependency graph for every global function
1608# or class method. Note that enabling this option will significantly increase
1609# the time of a run. So in most cases it will be better to enable caller
1610# graphs for selected functions only using the \callergraph command.
1611
1612CALLER_GRAPH = NO
1613
1614# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
1615# will generate a graphical hierarchy of all classes instead of a textual one.
1616
131GRAPHICAL_HIERARCHY = NO 1617GRAPHICAL_HIERARCHY = NO
1618
1619# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
1620# then doxygen will show the dependencies a directory has on other directories
1621# in a graphical way. The dependency relations are determined by the #include
1622# relations between the files in the directories.
1623
1624DIRECTORY_GRAPH = YES
1625
1626# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
1627# generated by dot. Possible values are png, svg, gif or svg.
1628# If left blank png will be used.
1629
132DOT_IMAGE_FORMAT = png 1630DOT_IMAGE_FORMAT = png
133DOT_PATH = 1631
134DOTFILE_DIRS = 1632# The tag DOT_PATH can be used to specify the path where the dot tool can be
135MAX_DOT_GRAPH_WIDTH = 512 1633# found. If left blank, it is assumed the dot tool can be found in the path.
136MAX_DOT_GRAPH_HEIGHT = 512 1634
1635DOT_PATH =
1636
1637# The DOTFILE_DIRS tag can be used to specify one or more directories that
1638# contain dot files that are included in the documentation (see the
1639# \dotfile command).
1640
1641DOTFILE_DIRS =
1642
1643# The MSCFILE_DIRS tag can be used to specify one or more directories that
1644# contain msc files that are included in the documentation (see the
1645# \mscfile command).
1646
1647MSCFILE_DIRS =
1648
1649# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
1650# nodes that will be shown in the graph. If the number of nodes in a graph
1651# becomes larger than this value, doxygen will truncate the graph, which is
1652# visualized by representing a node as a red box. Note that doxygen if the
1653# number of direct children of the root node in a graph is already larger than
1654# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
1655# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
1656
1657DOT_GRAPH_MAX_NODES = 50
1658
1659# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
1660# graphs generated by dot. A depth value of 3 means that only nodes reachable
1661# from the root by following a path via at most 3 edges will be shown. Nodes
1662# that lay further from the root node will be omitted. Note that setting this
1663# option to 1 or 2 may greatly reduce the computation time needed for large
1664# code bases. Also note that the size of a graph can be further restricted by
1665# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
1666
1667MAX_DOT_GRAPH_DEPTH = 0
1668
1669# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
1670# background. This is disabled by default, because dot on Windows does not
1671# seem to support this out of the box. Warning: Depending on the platform used,
1672# enabling this option may lead to badly anti-aliased labels on the edges of
1673# a graph (i.e. they become hard to read).
1674
1675DOT_TRANSPARENT = YES
1676
1677# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
1678# files in one run (i.e. multiple -o and -T options on the command line). This
1679# makes dot run faster, but since only newer versions of dot (>1.8.10)
1680# support this, this feature is disabled by default.
1681
1682DOT_MULTI_TARGETS = NO
1683
1684# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
1685# generate a legend page explaining the meaning of the various boxes and
1686# arrows in the dot generated graphs.
1687
137GENERATE_LEGEND = YES 1688GENERATE_LEGEND = YES
1689
1690# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
1691# remove the intermediate dot files that are used to generate
1692# the various graphs.
1693
138DOT_CLEANUP = YES 1694DOT_CLEANUP = YES
139SEARCHENGINE = NO
diff --git a/libraries/eet/doc/Makefile.am b/libraries/eet/doc/Makefile.am
index 12f7073..145376f 100644
--- a/libraries/eet/doc/Makefile.am
+++ b/libraries/eet/doc/Makefile.am
@@ -20,6 +20,7 @@ doc: doc-clean
20 bzip2 -9 $(PACKAGE_DOCNAME).tar 20 bzip2 -9 $(PACKAGE_DOCNAME).tar
21 rm -rf $(PACKAGE_DOCNAME)/ 21 rm -rf $(PACKAGE_DOCNAME)/
22 mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir) 22 mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
23 @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
23 24
24clean-local: doc-clean 25clean-local: doc-clean
25 26
@@ -30,7 +31,7 @@ doc:
30 31
31endif 32endif
32 33
33EXTRA_DIST = $(srcdir)/Doxyfile \ 34EXTRA_DIST = $(builddir)/Doxyfile \
34 $(srcdir)/e.css \ 35 $(srcdir)/e.css \
35 $(srcdir)/foot.html \ 36 $(srcdir)/foot.html \
36 $(srcdir)/head.html \ 37 $(srcdir)/head.html \
diff --git a/libraries/eet/doc/Makefile.in b/libraries/eet/doc/Makefile.in
index c3bcf00..e285740 100644
--- a/libraries/eet/doc/Makefile.in
+++ b/libraries/eet/doc/Makefile.in
@@ -143,8 +143,6 @@ PACKAGE_URL = @PACKAGE_URL@
143PACKAGE_VERSION = @PACKAGE_VERSION@ 143PACKAGE_VERSION = @PACKAGE_VERSION@
144PATH_SEPARATOR = @PATH_SEPARATOR@ 144PATH_SEPARATOR = @PATH_SEPARATOR@
145PKG_CONFIG = @PKG_CONFIG@ 145PKG_CONFIG = @PKG_CONFIG@
146PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
147PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
148RANLIB = @RANLIB@ 146RANLIB = @RANLIB@
149SED = @SED@ 147SED = @SED@
150SET_MAKE = @SET_MAKE@ 148SET_MAKE = @SET_MAKE@
@@ -214,7 +212,7 @@ top_srcdir = @top_srcdir@
214version_info = @version_info@ 212version_info = @version_info@
215MAINTAINERCLEANFILES = Makefile.in eet.dox 213MAINTAINERCLEANFILES = Makefile.in eet.dox
216PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc 214PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
217EXTRA_DIST = $(srcdir)/Doxyfile \ 215EXTRA_DIST = $(builddir)/Doxyfile \
218 $(srcdir)/e.css \ 216 $(srcdir)/e.css \
219 $(srcdir)/foot.html \ 217 $(srcdir)/foot.html \
220 $(srcdir)/head.html \ 218 $(srcdir)/head.html \
@@ -428,6 +426,7 @@ uninstall-am:
428@EFL_BUILD_DOC_TRUE@ bzip2 -9 $(PACKAGE_DOCNAME).tar 426@EFL_BUILD_DOC_TRUE@ bzip2 -9 $(PACKAGE_DOCNAME).tar
429@EFL_BUILD_DOC_TRUE@ rm -rf $(PACKAGE_DOCNAME)/ 427@EFL_BUILD_DOC_TRUE@ rm -rf $(PACKAGE_DOCNAME)/
430@EFL_BUILD_DOC_TRUE@ mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir) 428@EFL_BUILD_DOC_TRUE@ mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
429@EFL_BUILD_DOC_TRUE@ @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
431 430
432@EFL_BUILD_DOC_TRUE@clean-local: doc-clean 431@EFL_BUILD_DOC_TRUE@clean-local: doc-clean
433 432
diff --git a/libraries/eet/eet.spec b/libraries/eet/eet.spec
index 07cabba..4b7994b 100644
--- a/libraries/eet/eet.spec
+++ b/libraries/eet/eet.spec
@@ -3,7 +3,7 @@
3 3
4Summary: Library for speedy data storage, retrieval, and compression. 4Summary: Library for speedy data storage, retrieval, and compression.
5Name: eet 5Name: eet
6Version: 1.5.0 6Version: 1.5.99.67344
7Release: %{_rel} 7Release: %{_rel}
8License: BSD 8License: BSD
9Group: System Environment/Libraries 9Group: System Environment/Libraries
@@ -70,6 +70,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
70%{_includedir}/* 70%{_includedir}/*
71%{_libdir}/*.a 71%{_libdir}/*.a
72%{_libdir}/*.so 72%{_libdir}/*.so
73%{_datadir}/eet
73%{_libdir}/*.la 74%{_libdir}/*.la
74 75
75%changelog 76%changelog
diff --git a/libraries/eet/eet.spec.in b/libraries/eet/eet.spec.in
index 898fd7a..5a91f60 100644
--- a/libraries/eet/eet.spec.in
+++ b/libraries/eet/eet.spec.in
@@ -70,6 +70,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
70%{_includedir}/* 70%{_includedir}/*
71%{_libdir}/*.a 71%{_libdir}/*.a
72%{_libdir}/*.so 72%{_libdir}/*.so
73%{_datadir}/eet
73%{_libdir}/*.la 74%{_libdir}/*.la
74 75
75%changelog 76%changelog
diff --git a/libraries/eet/ltmain.sh b/libraries/eet/ltmain.sh
index fa4b1e1..7ed280b 100755
--- a/libraries/eet/ltmain.sh
+++ b/libraries/eet/ltmain.sh
@@ -65,7 +65,7 @@
65# compiler: $LTCC 65# compiler: $LTCC
66# compiler flags: $LTCFLAGS 66# compiler flags: $LTCFLAGS
67# linker: $LD (gnu? $with_gnu_ld) 67# linker: $LD (gnu? $with_gnu_ld)
68# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3 68# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
69# automake: $automake_version 69# automake: $automake_version
70# autoconf: $autoconf_version 70# autoconf: $autoconf_version
71# 71#
@@ -73,7 +73,7 @@
73 73
74PROGRAM=ltmain.sh 74PROGRAM=ltmain.sh
75PACKAGE=libtool 75PACKAGE=libtool
76VERSION="2.2.6b Debian-2.2.6b-2ubuntu3" 76VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
77TIMESTAMP="" 77TIMESTAMP=""
78package_revision=1.3017 78package_revision=1.3017
79 79
diff --git a/libraries/eet/sha1-for-source.txt b/libraries/eet/sha1-for-source.txt
deleted file mode 100644
index c9ecae4..0000000
--- a/libraries/eet/sha1-for-source.txt
+++ /dev/null
@@ -1 +0,0 @@
1bbbb3fea6997bc0cb3a5a1ce4ad00d7419b5e935
diff --git a/libraries/eet/src/Makefile.in b/libraries/eet/src/Makefile.in
index 0a28065..8b2aa37 100644
--- a/libraries/eet/src/Makefile.in
+++ b/libraries/eet/src/Makefile.in
@@ -182,8 +182,6 @@ PACKAGE_URL = @PACKAGE_URL@
182PACKAGE_VERSION = @PACKAGE_VERSION@ 182PACKAGE_VERSION = @PACKAGE_VERSION@
183PATH_SEPARATOR = @PATH_SEPARATOR@ 183PATH_SEPARATOR = @PATH_SEPARATOR@
184PKG_CONFIG = @PKG_CONFIG@ 184PKG_CONFIG = @PKG_CONFIG@
185PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
186PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
187RANLIB = @RANLIB@ 185RANLIB = @RANLIB@
188SED = @SED@ 186SED = @SED@
189SET_MAKE = @SET_MAKE@ 187SET_MAKE = @SET_MAKE@
diff --git a/libraries/eet/src/bin/Makefile.in b/libraries/eet/src/bin/Makefile.in
index 9273fac..4a899f5 100644
--- a/libraries/eet/src/bin/Makefile.in
+++ b/libraries/eet/src/bin/Makefile.in
@@ -177,8 +177,6 @@ PACKAGE_URL = @PACKAGE_URL@
177PACKAGE_VERSION = @PACKAGE_VERSION@ 177PACKAGE_VERSION = @PACKAGE_VERSION@
178PATH_SEPARATOR = @PATH_SEPARATOR@ 178PATH_SEPARATOR = @PATH_SEPARATOR@
179PKG_CONFIG = @PKG_CONFIG@ 179PKG_CONFIG = @PKG_CONFIG@
180PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
181PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
182RANLIB = @RANLIB@ 180RANLIB = @RANLIB@
183SED = @SED@ 181SED = @SED@
184SET_MAKE = @SET_MAKE@ 182SET_MAKE = @SET_MAKE@
diff --git a/libraries/eet/src/bin/eet_main.c b/libraries/eet/src/bin/eet_main.c
index 7ab5555..0d577ad 100644
--- a/libraries/eet/src/bin/eet_main.c
+++ b/libraries/eet/src/bin/eet_main.c
@@ -77,7 +77,7 @@ do_eet_extract(const char *file,
77 Eet_File *ef; 77 Eet_File *ef;
78 void *data; 78 void *data;
79 int size = 0; 79 int size = 0;
80 FILE *f; 80 FILE *f = stdout;
81 81
82 ef = eet_open(file, EET_FILE_MODE_READ); 82 ef = eet_open(file, EET_FILE_MODE_READ);
83 if (!ef) 83 if (!ef)
@@ -93,20 +93,23 @@ do_eet_extract(const char *file,
93 exit(-1); 93 exit(-1);
94 } 94 }
95 95
96 f = fopen(out, "wb"); 96 if (out)
97 if (!f)
98 { 97 {
99 ERR("cannot open %s", out); 98 f = fopen(out, "wb");
100 exit(-1); 99 if (!f)
100 {
101 ERR("cannot open %s", out);
102 exit(-1);
103 }
101 } 104 }
102 105
103 if (fwrite(data, size, 1, f) != 1) 106 if (fwrite(data, size, 1, f) != 1)
104 { 107 {
105 ERR("cannot write to %s", out); 108 ERR("cannot write to %s", out ? out : "standard output");
106 exit(-1); 109 exit(-1);
107 } 110 }
108 111
109 fclose(f); 112 if (out) fclose(f);
110 free(data); 113 free(data);
111 eet_close(ef); 114 eet_close(ef);
112} /* do_eet_extract */ 115} /* do_eet_extract */
@@ -125,7 +128,7 @@ do_eet_decode(const char *file,
125 const char *crypto_key) 128 const char *crypto_key)
126{ 129{
127 Eet_File *ef; 130 Eet_File *ef;
128 FILE *f; 131 FILE *f = stdout;
129 132
130 ef = eet_open(file, EET_FILE_MODE_READ); 133 ef = eet_open(file, EET_FILE_MODE_READ);
131 if (!ef) 134 if (!ef)
@@ -134,20 +137,23 @@ do_eet_decode(const char *file,
134 exit(-1); 137 exit(-1);
135 } 138 }
136 139
137 f = fopen(out, "wb"); 140 if (out)
138 if (!f)
139 { 141 {
140 ERR("cannot open %s", out); 142 f = fopen(out, "wb");
141 exit(-1); 143 if (!f)
144 {
145 ERR("cannot open %s", out);
146 exit(-1);
147 }
142 } 148 }
143 149
144 if (!eet_data_dump_cipher(ef, key, crypto_key, do_eet_decode_dump, f)) 150 if (!eet_data_dump_cipher(ef, key, crypto_key, do_eet_decode_dump, f))
145 { 151 {
146 ERR("cannot write to %s", out); 152 ERR("cannot write to %s", out ? out : "standard output");
147 exit(-1); 153 exit(-1);
148 } 154 }
149 155
150 fclose(f); 156 if (out) fclose(f);
151 eet_close(ef); 157 eet_close(ef);
152} /* do_eet_decode */ 158} /* do_eet_decode */
153 159
@@ -352,9 +358,9 @@ main(int argc,
352help: 358help:
353 printf( 359 printf(
354 "Usage:\n" 360 "Usage:\n"
355 " eet -l FILE.EET list all keys in FILE.EET\n" 361 " eet -l FILE.EET list all keys in FILE.EET\n"
356 " eet -x FILE.EET KEY OUT-FILE [CRYPTO_KEY] extract data stored in KEY in FILE.EET and write to OUT-FILE\n" 362 " eet -x FILE.EET KEY [OUT-FILE] [CRYPTO_KEY] extract data stored in KEY in FILE.EET and write to OUT-FILE or standard output\n"
357 " eet -d FILE.EET KEY OUT-FILE [CRYPTO_KEY] extract and decode data stored in KEY in FILE.EET and write to OUT-FILE\n" 363 " eet -d FILE.EET KEY [OUT-FILE] [CRYPTO_KEY] extract and decode data stored in KEY in FILE.EET and write to OUT-FILE or standard output\n"
358 " eet -i FILE.EET KEY IN-FILE COMPRESS [CRYPTO_KEY] insert data to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it\n" 364 " eet -i FILE.EET KEY IN-FILE COMPRESS [CRYPTO_KEY] insert data to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it\n"
359 " eet -e FILE.EET KEY IN-FILE COMPRESS [CRYPTO_KEY] insert and encode to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it\n" 365 " eet -e FILE.EET KEY IN-FILE COMPRESS [CRYPTO_KEY] insert and encode to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it\n"
360 " eet -r FILE.EET KEY remove KEY in FILE.EET\n" 366 " eet -r FILE.EET KEY remove KEY in FILE.EET\n"
@@ -369,19 +375,47 @@ help:
369 goto help; 375 goto help;
370 else if ((!strcmp(argv[1], "-l")) && (argc > 2)) 376 else if ((!strcmp(argv[1], "-l")) && (argc > 2))
371 do_eet_list(argv[2]); 377 do_eet_list(argv[2]);
372 else if ((!strcmp(argv[1], "-x")) && (argc > 4)) 378 else if ((!strcmp(argv[1], "-x")) && (argc > 3))
373 { 379 {
374 if (argc > 5) 380 switch (argc)
375 do_eet_extract(argv[2], argv[3], argv[4], argv[5]); 381 {
376 else 382 case 4:
377 do_eet_extract(argv[2], argv[3], argv[4], NULL); 383 {
384 do_eet_extract(argv[2], argv[3], NULL, NULL);
385 break;
386 }
387 case 5:
388 {
389 do_eet_extract(argv[2], argv[3], argv[4], NULL);
390 break;
391 }
392 default:
393 {
394 do_eet_extract(argv[2], argv[3], argv[4], argv[5]);
395 break;
396 }
397 }
378 } 398 }
379 else if ((!strcmp(argv[1], "-d")) && (argc > 4)) 399 else if ((!strcmp(argv[1], "-d")) && (argc > 3))
380 { 400 {
381 if (argc > 5) 401 switch (argc)
382 do_eet_decode(argv[2], argv[3], argv[4], argv[5]); 402 {
383 else 403 case 4:
384 do_eet_decode(argv[2], argv[3], argv[4], NULL); 404 {
405 do_eet_decode(argv[2], argv[3], NULL, NULL);
406 break;
407 }
408 case 5:
409 {
410 do_eet_decode(argv[2], argv[3], argv[4], NULL);
411 break;
412 }
413 default:
414 {
415 do_eet_decode(argv[2], argv[3], argv[4], argv[5]);
416 break;
417 }
418 }
385 } 419 }
386 else if ((!strcmp(argv[1], "-i")) && (argc > 5)) 420 else if ((!strcmp(argv[1], "-i")) && (argc > 5))
387 { 421 {
diff --git a/libraries/eet/src/examples/Makefile.am b/libraries/eet/src/examples/Makefile.am
index 8279445..6c5a324 100644
--- a/libraries/eet/src/examples/Makefile.am
+++ b/libraries/eet/src/examples/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3pkglibdir = $(datadir)/$(PACKAGE)/examples 3examplesdir = $(datadir)/$(PACKAGE)/examples
4 4
5if BUILD_EXAMPLES 5if BUILD_EXAMPLES
6AM_CPPFLAGS = \ 6AM_CPPFLAGS = \
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
8-I$(top_srcdir)/src/lib \ 8-I$(top_srcdir)/src/lib \
9@EINA_CFLAGS@ 9@EINA_CFLAGS@
10 10
11pkglib_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher 11examples_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher
12 12
13eet_basic_SOURCES = eet-basic.c 13eet_basic_SOURCES = eet-basic.c
14eet_basic_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ 14eet_basic_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@
diff --git a/libraries/eet/src/examples/Makefile.in b/libraries/eet/src/examples/Makefile.in
index d24b728..5830132 100644
--- a/libraries/eet/src/examples/Makefile.in
+++ b/libraries/eet/src/examples/Makefile.in
@@ -19,6 +19,7 @@
19VPATH = @srcdir@ 19VPATH = @srcdir@
20pkgdatadir = $(datadir)/@PACKAGE@ 20pkgdatadir = $(datadir)/@PACKAGE@
21pkgincludedir = $(includedir)/@PACKAGE@ 21pkgincludedir = $(includedir)/@PACKAGE@
22pkglibdir = $(libdir)/@PACKAGE@
22pkglibexecdir = $(libexecdir)/@PACKAGE@ 23pkglibexecdir = $(libexecdir)/@PACKAGE@
23am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 24am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
24install_sh_DATA = $(install_sh) -c -m 644 25install_sh_DATA = $(install_sh) -c -m 644
@@ -34,7 +35,7 @@ PRE_UNINSTALL = :
34POST_UNINSTALL = : 35POST_UNINSTALL = :
35build_triplet = @build@ 36build_triplet = @build@
36host_triplet = @host@ 37host_triplet = @host@
37@BUILD_EXAMPLES_TRUE@pkglib_PROGRAMS = eet_basic$(EXEEXT) \ 38@BUILD_EXAMPLES_TRUE@examples_PROGRAMS = eet_basic$(EXEEXT) \
38@BUILD_EXAMPLES_TRUE@ eet_file$(EXEEXT) \ 39@BUILD_EXAMPLES_TRUE@ eet_file$(EXEEXT) \
39@BUILD_EXAMPLES_TRUE@ eet_data_simple$(EXEEXT) \ 40@BUILD_EXAMPLES_TRUE@ eet_data_simple$(EXEEXT) \
40@BUILD_EXAMPLES_TRUE@ eet_data_nested$(EXEEXT) \ 41@BUILD_EXAMPLES_TRUE@ eet_data_nested$(EXEEXT) \
@@ -70,8 +71,8 @@ mkinstalldirs = $(install_sh) -d
70CONFIG_HEADER = $(top_builddir)/config.h 71CONFIG_HEADER = $(top_builddir)/config.h
71CONFIG_CLEAN_FILES = 72CONFIG_CLEAN_FILES =
72CONFIG_CLEAN_VPATH_FILES = 73CONFIG_CLEAN_VPATH_FILES =
73am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(filesdir)" 74am__installdirs = "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(filesdir)"
74PROGRAMS = $(pkglib_PROGRAMS) 75PROGRAMS = $(examples_PROGRAMS)
75am__eet_basic_SOURCES_DIST = eet-basic.c 76am__eet_basic_SOURCES_DIST = eet-basic.c
76@BUILD_EXAMPLES_TRUE@am_eet_basic_OBJECTS = eet-basic.$(OBJEXT) 77@BUILD_EXAMPLES_TRUE@am_eet_basic_OBJECTS = eet-basic.$(OBJEXT)
77eet_basic_OBJECTS = $(am_eet_basic_OBJECTS) 78eet_basic_OBJECTS = $(am_eet_basic_OBJECTS)
@@ -184,7 +185,6 @@ DATA = $(files_DATA)
184ETAGS = etags 185ETAGS = etags
185CTAGS = ctags 186CTAGS = ctags
186DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 187DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
187pkglibdir = $(datadir)/$(PACKAGE)/examples
188ACLOCAL = @ACLOCAL@ 188ACLOCAL = @ACLOCAL@
189ALLOCA = @ALLOCA@ 189ALLOCA = @ALLOCA@
190AMTAR = @AMTAR@ 190AMTAR = @AMTAR@
@@ -265,8 +265,6 @@ PACKAGE_URL = @PACKAGE_URL@
265PACKAGE_VERSION = @PACKAGE_VERSION@ 265PACKAGE_VERSION = @PACKAGE_VERSION@
266PATH_SEPARATOR = @PATH_SEPARATOR@ 266PATH_SEPARATOR = @PATH_SEPARATOR@
267PKG_CONFIG = @PKG_CONFIG@ 267PKG_CONFIG = @PKG_CONFIG@
268PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
269PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
270RANLIB = @RANLIB@ 268RANLIB = @RANLIB@
271SED = @SED@ 269SED = @SED@
272SET_MAKE = @SET_MAKE@ 270SET_MAKE = @SET_MAKE@
@@ -335,6 +333,7 @@ top_builddir = @top_builddir@
335top_srcdir = @top_srcdir@ 333top_srcdir = @top_srcdir@
336version_info = @version_info@ 334version_info = @version_info@
337MAINTAINERCLEANFILES = Makefile.in 335MAINTAINERCLEANFILES = Makefile.in
336examplesdir = $(datadir)/$(PACKAGE)/examples
338@BUILD_EXAMPLES_TRUE@AM_CPPFLAGS = \ 337@BUILD_EXAMPLES_TRUE@AM_CPPFLAGS = \
339@BUILD_EXAMPLES_TRUE@-I. \ 338@BUILD_EXAMPLES_TRUE@-I. \
340@BUILD_EXAMPLES_TRUE@-I$(top_srcdir)/src/lib \ 339@BUILD_EXAMPLES_TRUE@-I$(top_srcdir)/src/lib \
@@ -390,10 +389,10 @@ $(top_srcdir)/configure: $(am__configure_deps)
390$(ACLOCAL_M4): $(am__aclocal_m4_deps) 389$(ACLOCAL_M4): $(am__aclocal_m4_deps)
391 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 390 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
392$(am__aclocal_m4_deps): 391$(am__aclocal_m4_deps):
393install-pkglibPROGRAMS: $(pkglib_PROGRAMS) 392install-examplesPROGRAMS: $(examples_PROGRAMS)
394 @$(NORMAL_INSTALL) 393 @$(NORMAL_INSTALL)
395 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" 394 test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
396 @list='$(pkglib_PROGRAMS)'; test -n "$(pkglibdir)" || list=; \ 395 @list='$(examples_PROGRAMS)'; test -n "$(examplesdir)" || list=; \
397 for p in $$list; do echo "$$p $$p"; done | \ 396 for p in $$list; do echo "$$p $$p"; done | \
398 sed 's/$(EXEEXT)$$//' | \ 397 sed 's/$(EXEEXT)$$//' | \
399 while read p p1; do if test -f $$p || test -f $$p1; \ 398 while read p p1; do if test -f $$p || test -f $$p1; \
@@ -410,23 +409,23 @@ install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
410 while read type dir files; do \ 409 while read type dir files; do \
411 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ 410 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
412 test -z "$$files" || { \ 411 test -z "$$files" || { \
413 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibdir)$$dir'"; \ 412 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(examplesdir)$$dir'"; \
414 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibdir)$$dir" || exit $$?; \ 413 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(examplesdir)$$dir" || exit $$?; \
415 } \ 414 } \
416 ; done 415 ; done
417 416
418uninstall-pkglibPROGRAMS: 417uninstall-examplesPROGRAMS:
419 @$(NORMAL_UNINSTALL) 418 @$(NORMAL_UNINSTALL)
420 @list='$(pkglib_PROGRAMS)'; test -n "$(pkglibdir)" || list=; \ 419 @list='$(examples_PROGRAMS)'; test -n "$(examplesdir)" || list=; \
421 files=`for p in $$list; do echo "$$p"; done | \ 420 files=`for p in $$list; do echo "$$p"; done | \
422 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ 421 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
423 -e 's/$$/$(EXEEXT)/' `; \ 422 -e 's/$$/$(EXEEXT)/' `; \
424 test -n "$$list" || exit 0; \ 423 test -n "$$list" || exit 0; \
425 echo " ( cd '$(DESTDIR)$(pkglibdir)' && rm -f" $$files ")"; \ 424 echo " ( cd '$(DESTDIR)$(examplesdir)' && rm -f" $$files ")"; \
426 cd "$(DESTDIR)$(pkglibdir)" && rm -f $$files 425 cd "$(DESTDIR)$(examplesdir)" && rm -f $$files
427 426
428clean-pkglibPROGRAMS: 427clean-examplesPROGRAMS:
429 @list='$(pkglib_PROGRAMS)'; test -n "$$list" || exit 0; \ 428 @list='$(examples_PROGRAMS)'; test -n "$$list" || exit 0; \
430 echo " rm -f" $$list; \ 429 echo " rm -f" $$list; \
431 rm -f $$list || exit $$?; \ 430 rm -f $$list || exit $$?; \
432 test -n "$(EXEEXT)" || exit 0; \ 431 test -n "$(EXEEXT)" || exit 0; \
@@ -605,7 +604,7 @@ check-am: all-am
605check: check-am 604check: check-am
606all-am: Makefile $(PROGRAMS) $(DATA) 605all-am: Makefile $(PROGRAMS) $(DATA)
607installdirs: 606installdirs:
608 for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(filesdir)"; do \ 607 for dir in "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(filesdir)"; do \
609 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 608 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
610 done 609 done
611install: install-am 610install: install-am
@@ -636,7 +635,7 @@ maintainer-clean-generic:
636 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) 635 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
637clean: clean-am 636clean: clean-am
638 637
639clean-am: clean-generic clean-libtool clean-pkglibPROGRAMS \ 638clean-am: clean-examplesPROGRAMS clean-generic clean-libtool \
640 mostlyclean-am 639 mostlyclean-am
641 640
642distclean: distclean-am 641distclean: distclean-am
@@ -657,13 +656,13 @@ info: info-am
657 656
658info-am: 657info-am:
659 658
660install-data-am: install-filesDATA 659install-data-am: install-examplesPROGRAMS install-filesDATA
661 660
662install-dvi: install-dvi-am 661install-dvi: install-dvi-am
663 662
664install-dvi-am: 663install-dvi-am:
665 664
666install-exec-am: install-pkglibPROGRAMS 665install-exec-am:
667 666
668install-html: install-html-am 667install-html: install-html-am
669 668
@@ -703,24 +702,25 @@ ps: ps-am
703 702
704ps-am: 703ps-am:
705 704
706uninstall-am: uninstall-filesDATA uninstall-pkglibPROGRAMS 705uninstall-am: uninstall-examplesPROGRAMS uninstall-filesDATA
707 706
708.MAKE: install-am install-strip 707.MAKE: install-am install-strip
709 708
710.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ 709.PHONY: CTAGS GTAGS all all-am check check-am clean \
711 clean-libtool clean-pkglibPROGRAMS ctags distclean \ 710 clean-examplesPROGRAMS clean-generic clean-libtool ctags \
712 distclean-compile distclean-generic distclean-libtool \ 711 distclean distclean-compile distclean-generic \
713 distclean-tags distdir dvi dvi-am html html-am info info-am \ 712 distclean-libtool distclean-tags distdir dvi dvi-am html \
714 install install-am install-data install-data-am install-dvi \ 713 html-am info info-am install install-am install-data \
715 install-dvi-am install-exec install-exec-am install-filesDATA \ 714 install-data-am install-dvi install-dvi-am \
716 install-html install-html-am install-info install-info-am \ 715 install-examplesPROGRAMS install-exec install-exec-am \
717 install-man install-pdf install-pdf-am install-pkglibPROGRAMS \ 716 install-filesDATA install-html install-html-am install-info \
717 install-info-am install-man install-pdf install-pdf-am \
718 install-ps install-ps-am install-strip installcheck \ 718 install-ps install-ps-am install-strip installcheck \
719 installcheck-am installdirs maintainer-clean \ 719 installcheck-am installdirs maintainer-clean \
720 maintainer-clean-generic mostlyclean mostlyclean-compile \ 720 maintainer-clean-generic mostlyclean mostlyclean-compile \
721 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ 721 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
722 tags uninstall uninstall-am uninstall-filesDATA \ 722 tags uninstall uninstall-am uninstall-examplesPROGRAMS \
723 uninstall-pkglibPROGRAMS 723 uninstall-filesDATA
724 724
725 725
726# Tell versions [3.59,3.63) of GNU make to not export all variables. 726# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/libraries/eet/src/lib/Eet.h b/libraries/eet/src/lib/Eet.h
index 8fda1e0..2df7fbf 100644
--- a/libraries/eet/src/lib/Eet.h
+++ b/libraries/eet/src/lib/Eet.h
@@ -188,7 +188,7 @@ extern "C" {
188 */ 188 */
189 189
190#define EET_VERSION_MAJOR 1 190#define EET_VERSION_MAJOR 1
191#define EET_VERSION_MINOR 4 191#define EET_VERSION_MINOR 6
192/** 192/**
193 * @typedef Eet_Version 193 * @typedef Eet_Version
194 * 194 *
@@ -755,7 +755,7 @@ eet_delete(Eet_File *ef,
755 755
756/** 756/**
757 * Alias a specific section to another one. Destination may exist or not, 757 * Alias a specific section to another one. Destination may exist or not,
758 * no check are done. 758 * no checks are done.
759 * @param ef A valid eet file handle opened for writing. 759 * @param ef A valid eet file handle opened for writing.
760 * @param name Name of the new entry. eg: "/base/file_i_want". 760 * @param name Name of the new entry. eg: "/base/file_i_want".
761 * @param destination Actual source of the aliased entry eg: "/base/the_real_stuff_i_want". 761 * @param destination Actual source of the aliased entry eg: "/base/the_real_stuff_i_want".
@@ -775,6 +775,19 @@ eet_alias(Eet_File *ef,
775 int compress); 775 int compress);
776 776
777/** 777/**
778 * Retrieve the filename of an Eet_File
779 * @param ef A valid eet file handle opened for writing.
780 * @return The stringshared file string opened with eet_open(), or NULL on error
781 *
782 * @note This function will return NULL for files opened with eet_memopen_read()
783 *
784 * @since 1.6
785 * @ingroup Eet_File_Group
786 */
787EAPI const char *
788eet_file_get(Eet_File *ef);
789
790/**
778 * Retrieve the destination name of an alias 791 * Retrieve the destination name of an alias
779 * @param ef A valid eet file handle opened for writing 792 * @param ef A valid eet file handle opened for writing
780 * @param name Name of the entry. eg: "/base/file_i_want" 793 * @param name Name of the entry. eg: "/base/file_i_want"
diff --git a/libraries/eet/src/lib/Eet_private.h b/libraries/eet/src/lib/Eet_private.h
index 83f4c18..c04daf0 100644
--- a/libraries/eet/src/lib/Eet_private.h
+++ b/libraries/eet/src/lib/Eet_private.h
@@ -66,6 +66,126 @@ struct _Eet_Node
66 Eet_Node_Data data; 66 Eet_Node_Data data;
67}; 67};
68 68
69typedef struct _Eet_File_Header Eet_File_Header;
70typedef struct _Eet_File_Node Eet_File_Node;
71typedef struct _Eet_File_Directory Eet_File_Directory;
72
73struct _Eet_File
74{
75 const char *path;
76 Eina_File *readfp;
77 Eet_File_Header *header;
78 Eet_Dictionary *ed;
79 Eet_Key *key;
80 const unsigned char *data;
81 const void *x509_der;
82 const void *signature;
83 void *sha1;
84
85 Eet_File_Mode mode;
86
87 int magic;
88 int references;
89
90 unsigned long int data_size;
91 int x509_length;
92 unsigned int signature_length;
93 int sha1_length;
94
95 Eina_Lock file_lock;
96
97 unsigned char writes_pending : 1;
98 unsigned char delete_me_now : 1;
99};
100
101struct _Eet_File_Header
102{
103 int magic;
104 Eet_File_Directory *directory;
105};
106
107struct _Eet_File_Directory
108{
109 int size;
110 Eet_File_Node **nodes;
111};
112
113struct _Eet_File_Node
114{
115 char *name;
116 void *data;
117 Eet_File_Node *next; /* FIXME: make buckets linked lists */
118
119 unsigned long int offset;
120 unsigned long int dictionary_offset;
121 unsigned long int name_offset;
122
123 unsigned int name_size;
124 unsigned int size;
125 unsigned int data_size;
126
127 unsigned char free_name : 1;
128 unsigned char compression : 1;
129 unsigned char ciphered : 1;
130 unsigned char alias : 1;
131};
132
133#if 0
134/* Version 2 */
135/* NB: all int's are stored in network byte order on disk */
136/* file format: */
137int magic; /* magic number ie 0x1ee7ff00 */
138int num_directory_entries; /* number of directory entries to follow */
139int bytes_directory_entries; /* bytes of directory entries to follow */
140struct
141{
142 int offset; /* bytes offset into file for data chunk */
143 int flags; /* flags - for now 0 = uncompressed and clear, 1 = compressed and clear, 2 = uncompressed and ciphered, 3 = compressed and ciphered */
144 int size; /* size of the data chunk */
145 int data_size; /* size of the (uncompressed) data chunk */
146 int name_size; /* length in bytes of the name field */
147 char name[name_size]; /* name string (variable length) and \0 terminated */
148} directory[num_directory_entries];
149/* and now startes the data stream... */
150#endif /* if 0 */
151
152#if 0
153/* Version 3 */
154/* NB: all int's are stored in network byte order on disk */
155/* file format: */
156int magic; /* magic number ie 0x1ee70f42 */
157int num_directory_entries; /* number of directory entries to follow */
158int num_dictionary_entries; /* number of dictionary entries to follow */
159struct
160{
161 int data_offset; /* bytes offset into file for data chunk */
162 int size; /* size of the data chunk */
163 int data_size; /* size of the (uncompressed) data chunk */
164 int name_offset; /* bytes offset into file for name string */
165 int name_size; /* length in bytes of the name field */
166 int flags; /* bit flags - for now:
167 bit 0 => compresion on/off
168 bit 1 => ciphered on/off
169 bit 2 => alias
170 */
171} directory[num_directory_entries];
172struct
173{
174 int hash;
175 int offset;
176 int size;
177 int prev;
178 int next;
179} dictionary[num_dictionary_entries];
180/* now start the string stream. */
181/* and right after them the data stream. */
182int magic_sign; /* Optional, only if the eet file is signed. */
183int signature_length; /* Signature length. */
184int x509_length; /* Public certificate that signed the file. */
185char signature[signature_length]; /* The signature. */
186char x509[x509_length]; /* The public certificate. */
187#endif /* if 0 */
188
69/* 189/*
70 * variable and macros used for the eina_log module 190 * variable and macros used for the eina_log module
71 */ 191 */
@@ -178,6 +298,21 @@ Eet_Node *
178void 298void
179 eet_node_free(Eet_Node *node); 299 eet_node_free(Eet_Node *node);
180 300
301
302#define GENERIC_ALLOC_FREE_HEADER(TYPE, Type) \
303 TYPE *Type##_malloc(unsigned int); \
304 TYPE *Type##_calloc(unsigned int); \
305 void Type##_mp_free(TYPE *e);
306
307GENERIC_ALLOC_FREE_HEADER(Eet_File_Directory, eet_file_directory);
308GENERIC_ALLOC_FREE_HEADER(Eet_File_Node, eet_file_node);
309GENERIC_ALLOC_FREE_HEADER(Eet_File_Header, eet_file_header);
310GENERIC_ALLOC_FREE_HEADER(Eet_Dictionary, eet_dictionary);
311GENERIC_ALLOC_FREE_HEADER(Eet_File, eet_file);
312
313Eina_Bool eet_mempool_init(void);
314void eet_mempool_shutdown(void);
315
181#ifndef PATH_MAX 316#ifndef PATH_MAX
182# define PATH_MAX 4096 317# define PATH_MAX 4096
183#endif /* ifndef PATH_MAX */ 318#endif /* ifndef PATH_MAX */
diff --git a/libraries/eet/src/lib/Makefile.am b/libraries/eet/src/lib/Makefile.am
index 4633749..ae60168 100644
--- a/libraries/eet/src/lib/Makefile.am
+++ b/libraries/eet/src/lib/Makefile.am
@@ -22,6 +22,7 @@ includesdir = $(includedir)/eet-@VMAJ@
22lib_LTLIBRARIES = libeet.la 22lib_LTLIBRARIES = libeet.la
23 23
24base_sources = \ 24base_sources = \
25eet_alloc.c \
25eet_lib.c \ 26eet_lib.c \
26eet_data.c \ 27eet_data.c \
27eet_image.c \ 28eet_image.c \
diff --git a/libraries/eet/src/lib/Makefile.in b/libraries/eet/src/lib/Makefile.in
index f80bcd8..2a3fec0 100644
--- a/libraries/eet/src/lib/Makefile.in
+++ b/libraries/eet/src/lib/Makefile.in
@@ -80,13 +80,14 @@ am__base_list = \
80am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includesdir)" 80am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includesdir)"
81LTLIBRARIES = $(lib_LTLIBRARIES) 81LTLIBRARIES = $(lib_LTLIBRARIES)
82libeet_la_DEPENDENCIES = 82libeet_la_DEPENDENCIES =
83am__libeet_la_SOURCES_DIST = eet_lib.c eet_data.c eet_image.c \ 83am__libeet_la_SOURCES_DIST = eet_alloc.c eet_lib.c eet_data.c \
84 eet_cipher.c eet_dictionary.c eet_node.c eet_utils.c \ 84 eet_image.c eet_cipher.c eet_dictionary.c eet_node.c \
85 eet_connection.c 85 eet_utils.c eet_connection.c
86am__objects_1 = libeet_la-eet_lib.lo libeet_la-eet_data.lo \ 86am__objects_1 = libeet_la-eet_alloc.lo libeet_la-eet_lib.lo \
87 libeet_la-eet_image.lo libeet_la-eet_cipher.lo \ 87 libeet_la-eet_data.lo libeet_la-eet_image.lo \
88 libeet_la-eet_dictionary.lo libeet_la-eet_node.lo \ 88 libeet_la-eet_cipher.lo libeet_la-eet_dictionary.lo \
89 libeet_la-eet_utils.lo libeet_la-eet_connection.lo 89 libeet_la-eet_node.lo libeet_la-eet_utils.lo \
90 libeet_la-eet_connection.lo
90@EET_AMALGAMATION_FALSE@am_libeet_la_OBJECTS = $(am__objects_1) 91@EET_AMALGAMATION_FALSE@am_libeet_la_OBJECTS = $(am__objects_1)
91@EET_AMALGAMATION_TRUE@nodist_libeet_la_OBJECTS = \ 92@EET_AMALGAMATION_TRUE@nodist_libeet_la_OBJECTS = \
92@EET_AMALGAMATION_TRUE@ libeet_la-eet_amalgamation.lo 93@EET_AMALGAMATION_TRUE@ libeet_la-eet_amalgamation.lo
@@ -210,8 +211,6 @@ PACKAGE_URL = @PACKAGE_URL@
210PACKAGE_VERSION = @PACKAGE_VERSION@ 211PACKAGE_VERSION = @PACKAGE_VERSION@
211PATH_SEPARATOR = @PATH_SEPARATOR@ 212PATH_SEPARATOR = @PATH_SEPARATOR@
212PKG_CONFIG = @PKG_CONFIG@ 213PKG_CONFIG = @PKG_CONFIG@
213PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
214PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
215RANLIB = @RANLIB@ 214RANLIB = @RANLIB@
216SED = @SED@ 215SED = @SED@
217SET_MAKE = @SET_MAKE@ 216SET_MAKE = @SET_MAKE@
@@ -299,6 +298,7 @@ includes_HEADERS = Eet.h
299includesdir = $(includedir)/eet-@VMAJ@ 298includesdir = $(includedir)/eet-@VMAJ@
300lib_LTLIBRARIES = libeet.la 299lib_LTLIBRARIES = libeet.la
301base_sources = \ 300base_sources = \
301eet_alloc.c \
302eet_lib.c \ 302eet_lib.c \
303eet_data.c \ 303eet_data.c \
304eet_image.c \ 304eet_image.c \
@@ -388,6 +388,7 @@ mostlyclean-compile:
388distclean-compile: 388distclean-compile:
389 -rm -f *.tab.c 389 -rm -f *.tab.c
390 390
391@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeet_la-eet_alloc.Plo@am__quote@
391@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeet_la-eet_amalgamation.Plo@am__quote@ 392@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeet_la-eet_amalgamation.Plo@am__quote@
392@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeet_la-eet_cipher.Plo@am__quote@ 393@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeet_la-eet_cipher.Plo@am__quote@
393@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeet_la-eet_connection.Plo@am__quote@ 394@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeet_la-eet_connection.Plo@am__quote@
@@ -422,6 +423,14 @@ distclean-compile:
422@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 423@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
423@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< 424@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
424 425
426libeet_la-eet_alloc.lo: eet_alloc.c
427@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeet_la_CFLAGS) $(CFLAGS) -MT libeet_la-eet_alloc.lo -MD -MP -MF $(DEPDIR)/libeet_la-eet_alloc.Tpo -c -o libeet_la-eet_alloc.lo `test -f 'eet_alloc.c' || echo '$(srcdir)/'`eet_alloc.c
428@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeet_la-eet_alloc.Tpo $(DEPDIR)/libeet_la-eet_alloc.Plo
429@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
430@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eet_alloc.c' object='libeet_la-eet_alloc.lo' libtool=yes @AMDEPBACKSLASH@
431@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
432@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeet_la_CFLAGS) $(CFLAGS) -c -o libeet_la-eet_alloc.lo `test -f 'eet_alloc.c' || echo '$(srcdir)/'`eet_alloc.c
433
425libeet_la-eet_lib.lo: eet_lib.c 434libeet_la-eet_lib.lo: eet_lib.c
426@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeet_la_CFLAGS) $(CFLAGS) -MT libeet_la-eet_lib.lo -MD -MP -MF $(DEPDIR)/libeet_la-eet_lib.Tpo -c -o libeet_la-eet_lib.lo `test -f 'eet_lib.c' || echo '$(srcdir)/'`eet_lib.c 435@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeet_la_CFLAGS) $(CFLAGS) -MT libeet_la-eet_lib.lo -MD -MP -MF $(DEPDIR)/libeet_la-eet_lib.Tpo -c -o libeet_la-eet_lib.lo `test -f 'eet_lib.c' || echo '$(srcdir)/'`eet_lib.c
427@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeet_la-eet_lib.Tpo $(DEPDIR)/libeet_la-eet_lib.Plo 436@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeet_la-eet_lib.Tpo $(DEPDIR)/libeet_la-eet_lib.Plo
diff --git a/libraries/eet/src/lib/eet_alloc.c b/libraries/eet/src/lib/eet_alloc.c
new file mode 100644
index 0000000..85351ad
--- /dev/null
+++ b/libraries/eet/src/lib/eet_alloc.c
@@ -0,0 +1,93 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#endif
4
5#include <Eina.h>
6#include "Eet.h"
7#include "Eet_private.h"
8
9typedef struct _Eet_Mempool Eet_Mempool;
10struct _Eet_Mempool
11{
12 const char *name;
13 Eina_Mempool *mp;
14 size_t size;
15};
16
17#define GENERIC_ALLOC_FREE(TYPE, Type) \
18 Eet_Mempool Type##_mp = { #TYPE, NULL, sizeof (TYPE) }; \
19 \
20 TYPE * \
21 Type##_malloc(unsigned int num) \
22 { \
23 return eina_mempool_malloc(Type##_mp.mp, num * sizeof (TYPE)); \
24 } \
25 TYPE * \
26 Type##_calloc(unsigned int num) \
27 { \
28 return eina_mempool_calloc(Type##_mp.mp, num * sizeof (TYPE)); \
29 } \
30 void \
31 Type##_mp_free(TYPE *e) \
32 { \
33 eina_mempool_free(Type##_mp.mp, e); \
34 }
35
36GENERIC_ALLOC_FREE(Eet_File_Directory, eet_file_directory);
37GENERIC_ALLOC_FREE(Eet_File_Node, eet_file_node);
38GENERIC_ALLOC_FREE(Eet_File_Header, eet_file_header);
39GENERIC_ALLOC_FREE(Eet_Dictionary, eet_dictionary);
40GENERIC_ALLOC_FREE(Eet_File, eet_file);
41
42static Eet_Mempool *mempool_array[] = {
43 &eet_file_directory_mp,
44 &eet_file_node_mp,
45 &eet_file_header_mp,
46 &eet_dictionary_mp,
47 &eet_file_mp,
48};
49
50Eina_Bool
51eet_mempool_init(void)
52{
53 const char *choice;
54 unsigned int i;
55
56 choice = getenv("EINA_MEMPOOL");
57 if ((!choice) || (!choice[0]))
58 choice = "chained_mempool";
59
60 for (i = 0; i < sizeof (mempool_array) / sizeof (mempool_array[0]); ++i)
61 {
62 retry:
63 mempool_array[i]->mp = eina_mempool_add(choice, mempool_array[i]->name, NULL, mempool_array[i]->size, 64);
64 if (!mempool_array[i]->mp)
65 {
66 if (!strcmp(choice, "pass_through"))
67 {
68 ERR("Falling back to pass through ! Previously tried '%s' mempool.", choice);
69 choice = "pass_through";
70 goto retry;
71 }
72 else
73 {
74 ERR("Impossible to allocate mempool '%s' !", choice);
75 return EINA_FALSE;
76 }
77 }
78 }
79 return EINA_TRUE;
80}
81
82void
83eet_mempool_shutdown(void)
84{
85 unsigned int i;
86
87 for (i = 0; i < sizeof (mempool_array) / sizeof (mempool_array[0]); ++i)
88 {
89 eina_mempool_del(mempool_array[i]->mp);
90 mempool_array[i]->mp = NULL;
91 }
92}
93
diff --git a/libraries/eet/src/lib/eet_cipher.c b/libraries/eet/src/lib/eet_cipher.c
index 89ee65d..37a0899 100644
--- a/libraries/eet/src/lib/eet_cipher.c
+++ b/libraries/eet/src/lib/eet_cipher.c
@@ -275,7 +275,7 @@ on_error:
275 cb = NULL; 275 cb = NULL;
276#endif /* ifdef HAVE_SIGNATURE */ 276#endif /* ifdef HAVE_SIGNATURE */
277 return NULL; 277 return NULL;
278} /* eet_identity_open */ 278}
279 279
280EAPI void 280EAPI void
281eet_identity_close(Eet_Key *key) 281eet_identity_close(Eet_Key *key)
@@ -295,7 +295,7 @@ eet_identity_close(Eet_Key *key)
295#else 295#else
296 key = NULL; 296 key = NULL;
297#endif /* ifdef HAVE_SIGNATURE */ 297#endif /* ifdef HAVE_SIGNATURE */
298} /* eet_identity_close */ 298}
299 299
300EAPI void 300EAPI void
301eet_identity_print(Eet_Key *key, 301eet_identity_print(Eet_Key *key,
@@ -419,7 +419,7 @@ on_error:
419 out = NULL; 419 out = NULL;
420 ERR("You need to compile signature support in EET."); 420 ERR("You need to compile signature support in EET.");
421#endif /* ifdef HAVE_SIGNATURE */ 421#endif /* ifdef HAVE_SIGNATURE */
422} /* eet_identity_print */ 422}
423 423
424void 424void
425eet_identity_ref(Eet_Key *key) 425eet_identity_ref(Eet_Key *key)
@@ -428,7 +428,7 @@ eet_identity_ref(Eet_Key *key)
428 return; 428 return;
429 429
430 key->references++; 430 key->references++;
431} /* eet_identity_ref */ 431}
432 432
433void 433void
434eet_identity_unref(Eet_Key *key) 434eet_identity_unref(Eet_Key *key)
@@ -438,7 +438,7 @@ eet_identity_unref(Eet_Key *key)
438 438
439 key->references--; 439 key->references--;
440 eet_identity_close(key); 440 eet_identity_close(key);
441} /* eet_identity_unref */ 441}
442 442
443void * 443void *
444eet_identity_compute_sha1(const void *data_base, 444eet_identity_compute_sha1(const void *data_base,
@@ -479,7 +479,7 @@ eet_identity_compute_sha1(const void *data_base,
479#endif /* ifdef HAVE_SIGNATURE */ 479#endif /* ifdef HAVE_SIGNATURE */
480 480
481 return result; 481 return result;
482} /* eet_identity_compute_sha1 */ 482}
483 483
484Eet_Error 484Eet_Error
485eet_identity_sign(FILE *fp, 485eet_identity_sign(FILE *fp,
@@ -650,7 +650,7 @@ on_error:
650 key = NULL; 650 key = NULL;
651 return EET_ERROR_NOT_IMPLEMENTED; 651 return EET_ERROR_NOT_IMPLEMENTED;
652#endif /* ifdef HAVE_SIGNATURE */ 652#endif /* ifdef HAVE_SIGNATURE */
653} /* eet_identity_sign */ 653}
654 654
655const void * 655const void *
656eet_identity_check(const void *data_base, 656eet_identity_check(const void *data_base,
@@ -830,7 +830,7 @@ eet_identity_check(const void *data_base,
830 x509_length = NULL; 830 x509_length = NULL;
831 return NULL; 831 return NULL;
832#endif /* ifdef HAVE_SIGNATURE */ 832#endif /* ifdef HAVE_SIGNATURE */
833} /* eet_identity_check */ 833}
834 834
835EAPI void 835EAPI void
836eet_identity_certificate_print(const unsigned char *certificate, 836eet_identity_certificate_print(const unsigned char *certificate,
@@ -896,7 +896,7 @@ on_error:
896 out = NULL; 896 out = NULL;
897 ERR("You need to compile signature support in EET."); 897 ERR("You need to compile signature support in EET.");
898#endif /* ifdef HAVE_SIGNATURE */ 898#endif /* ifdef HAVE_SIGNATURE */
899} /* eet_identity_certificate_print */ 899}
900 900
901Eet_Error 901Eet_Error
902eet_cipher(const void *data, 902eet_cipher(const void *data,
@@ -1073,7 +1073,7 @@ on_error:
1073 (void)result_length; 1073 (void)result_length;
1074 return EET_ERROR_NOT_IMPLEMENTED; 1074 return EET_ERROR_NOT_IMPLEMENTED;
1075#endif /* ifdef HAVE_CIPHER */ 1075#endif /* ifdef HAVE_CIPHER */
1076} /* eet_cipher */ 1076}
1077 1077
1078Eet_Error 1078Eet_Error
1079eet_decipher(const void *data, 1079eet_decipher(const void *data,
@@ -1224,7 +1224,7 @@ on_error:
1224 (void)result_length; 1224 (void)result_length;
1225 return EET_ERROR_NOT_IMPLEMENTED; 1225 return EET_ERROR_NOT_IMPLEMENTED;
1226#endif /* ifdef HAVE_CIPHER */ 1226#endif /* ifdef HAVE_CIPHER */
1227} /* eet_decipher */ 1227}
1228 1228
1229#ifdef HAVE_CIPHER 1229#ifdef HAVE_CIPHER
1230# ifdef HAVE_GNUTLS 1230# ifdef HAVE_GNUTLS
@@ -1265,7 +1265,7 @@ eet_hmac_sha1(const void *key,
1265 gcry_md_close(mdh); 1265 gcry_md_close(mdh);
1266 1266
1267 return 0; 1267 return 0;
1268} /* eet_hmac_sha1 */ 1268}
1269 1269
1270# endif /* ifdef HAVE_GNUTLS */ 1270# endif /* ifdef HAVE_GNUTLS */
1271 1271
@@ -1337,6 +1337,6 @@ eet_pbkdf2_sha1(const char *key,
1337 HMAC_cleanup(&hctx); 1337 HMAC_cleanup(&hctx);
1338# endif /* ifdef HAVE_GNUTLS */ 1338# endif /* ifdef HAVE_GNUTLS */
1339 return 0; 1339 return 0;
1340} /* eet_pbkdf2_sha1 */ 1340}
1341 1341
1342#endif /* ifdef HAVE_CIPHER */ 1342#endif /* ifdef HAVE_CIPHER */
diff --git a/libraries/eet/src/lib/eet_connection.c b/libraries/eet/src/lib/eet_connection.c
index 6171b7e..7b6b934 100644
--- a/libraries/eet/src/lib/eet_connection.c
+++ b/libraries/eet/src/lib/eet_connection.c
@@ -35,6 +35,8 @@ void *alloca(size_t);
35#include "Eet.h" 35#include "Eet.h"
36#include "Eet_private.h" 36#include "Eet_private.h"
37 37
38/* max message size: 1Mb - raised from original 64Kb */
39#define MAX_MSG_SIZE (1024 * 1024)
38#define MAGIC_EET_DATA_PACKET 0x4270ACE1 40#define MAGIC_EET_DATA_PACKET 0x4270ACE1
39 41
40struct _Eet_Connection 42struct _Eet_Connection
@@ -56,74 +58,62 @@ eet_connection_new(Eet_Read_Cb *eet_read_cb,
56 const void *user_data) 58 const void *user_data)
57{ 59{
58 Eet_Connection *conn; 60 Eet_Connection *conn;
59 61
60 if (!eet_read_cb || !eet_write_cb) 62 if ((!eet_read_cb) || (!eet_write_cb)) return NULL;
61 return NULL; 63
62
63 conn = calloc(1, sizeof (Eet_Connection)); 64 conn = calloc(1, sizeof (Eet_Connection));
64 if (!conn) 65 if (!conn) return NULL;
65 return NULL;
66
67 conn->eet_read_cb = eet_read_cb; 66 conn->eet_read_cb = eet_read_cb;
68 conn->eet_write_cb = eet_write_cb; 67 conn->eet_write_cb = eet_write_cb;
69 conn->user_data = (void *)user_data; 68 conn->user_data = (void *)user_data;
70
71 return conn; 69 return conn;
72} /* eet_connection_new */ 70}
73 71
74EAPI int 72EAPI int
75eet_connection_received(Eet_Connection *conn, 73eet_connection_received(Eet_Connection *conn,
76 const void *data, 74 const void *data,
77 size_t size) 75 size_t size)
78{ 76{
79 if ((!conn) || (!data) || (!size)) 77 if ((!conn) || (!data) || (!size)) return size;
80 return size; 78 do
81 79 {
82 do {
83 size_t copy_size; 80 size_t copy_size;
84 81
85 if (conn->size == 0) 82 if (conn->size == 0)
86 { 83 {
87 const int *msg; 84 const int *msg;
88 size_t packet_size; 85 size_t packet_size;
89 86
90 if (size < sizeof (int) * 2) 87 if (size < (sizeof(int) * 2)) break;
91 break;
92 88
93 msg = data; 89 msg = data;
94 /* Check the magic */ 90 /* Check the magic */
95 if (ntohl(msg[0]) != MAGIC_EET_DATA_PACKET) 91 if (ntohl(msg[0]) != MAGIC_EET_DATA_PACKET) break;
96 break;
97 92
98 packet_size = ntohl(msg[1]); 93 packet_size = ntohl(msg[1]);
99 /* Message should always be under 64K */ 94 /* Message should always be under MAX_MSG_SIZE */
100 if (packet_size > 64 * 1024) 95 if (packet_size > MAX_MSG_SIZE) break;
101 break;
102 96
103 data = (void *)(msg + 2); 97 data = (void *)(msg + 2);
104 size -= sizeof (int) * 2; 98 size -= sizeof(int) * 2;
105 if ((size_t)packet_size <= size) 99 if ((size_t)packet_size <= size)
106 { 100 {
107 /* Not a partial receive, go the quick way. */ 101 /* Not a partial receive, go the quick way. */
108 if (!conn->eet_read_cb(data, packet_size, conn->user_data)) 102 if (!conn->eet_read_cb(data, packet_size, conn->user_data))
109 break; 103 break;
110 104
111 data = (void *)((char *)data + packet_size); 105 data = (void *)((char *)data + packet_size);
112 size -= packet_size; 106 size -= packet_size;
113 107 conn->received = 0;
114 conn->received = 0; 108 continue;
115 continue;
116 } 109 }
117
118 conn->size = packet_size; 110 conn->size = packet_size;
119 if (conn->allocated < conn->size) 111 if (conn->allocated < conn->size)
120 { 112 {
121 void *tmp; 113 void *tmp;
122 114
123 tmp = realloc(conn->buffer, conn->size); 115 tmp = realloc(conn->buffer, conn->size);
124 if (!tmp) 116 if (!tmp) break;
125 break;
126
127 conn->buffer = tmp; 117 conn->buffer = tmp;
128 conn->allocated = conn->size; 118 conn->allocated = conn->size;
129 } 119 }
@@ -132,33 +122,33 @@ eet_connection_received(Eet_Connection *conn,
132 /* Partial receive */ 122 /* Partial receive */
133 copy_size = 123 copy_size =
134 (conn->size - conn->received >= 124 (conn->size - conn->received >=
135 size) ? size : conn->size - conn->received; 125 size) ? size : conn->size - conn->received;
136 memcpy((char *)conn->buffer + conn->received, data, copy_size); 126 memcpy((char *)conn->buffer + conn->received, data, copy_size);
137 127
138 conn->received += copy_size; 128 conn->received += copy_size;
139 data = (void *)((char *)data + copy_size); 129 data = (void *)((char *)data + copy_size);
140 size -= copy_size; 130 size -= copy_size;
141 131
142 if (conn->received == conn->size) 132 if (conn->received == conn->size)
143 { 133 {
144 size_t data_size; 134 size_t data_size;
145 135
146 data_size = conn->size; 136 data_size = conn->size;
147 conn->size = 0; 137 conn->size = 0;
148 conn->received = 0; 138 conn->received = 0;
149
150 /* Completed a packet. */ 139 /* Completed a packet. */
151 if (!conn->eet_read_cb(conn->buffer, data_size, conn->user_data)) 140 if (!conn->eet_read_cb(conn->buffer, data_size, conn->user_data))
152 { 141 {
153 /* Something goes wrong. Stop now. */ 142 /* Something goes wrong. Stop now. */
154 size += data_size; 143 size += data_size;
155 break; 144 break;
156 } 145 }
157 } 146 }
158 } while (size > 0); 147 }
159 148 while (size > 0);
149
160 return size; 150 return size;
161} /* eet_connection_received */ 151}
162 152
163static Eina_Bool 153static Eina_Bool
164_eet_connection_raw_send(Eet_Connection *conn, 154_eet_connection_raw_send(Eet_Connection *conn,
@@ -167,21 +157,17 @@ _eet_connection_raw_send(Eet_Connection *conn,
167{ 157{
168 int *message; 158 int *message;
169 159
170 /* Message should never be above 64K */ 160 /* Message should always be under MAX_MSG_SIZE */
171 if (data_size > 64 * 1024) 161 if (data_size > MAX_MSG_SIZE) return EINA_FALSE;
172 return EINA_FALSE; 162 message = alloca(data_size + (sizeof(int) * 2));
173
174 message = alloca(data_size + sizeof (int) * 2);
175 message[0] = htonl(MAGIC_EET_DATA_PACKET); 163 message[0] = htonl(MAGIC_EET_DATA_PACKET);
176 message[1] = htonl(data_size); 164 message[1] = htonl(data_size);
177
178 memcpy(message + 2, data, data_size); 165 memcpy(message + 2, data, data_size);
179
180 conn->eet_write_cb(message, 166 conn->eet_write_cb(message,
181 data_size + sizeof (int) * 2, 167 data_size + (sizeof(int) * 2),
182 conn->user_data); 168 conn->user_data);
183 return EINA_TRUE; 169 return EINA_TRUE;
184} /* _eet_connection_raw_send */ 170}
185 171
186EAPI Eina_Bool 172EAPI Eina_Bool
187eet_connection_send(Eet_Connection *conn, 173eet_connection_send(Eet_Connection *conn,
@@ -197,15 +183,11 @@ eet_connection_send(Eet_Connection *conn,
197 data_in, 183 data_in,
198 cipher_key, 184 cipher_key,
199 &data_size); 185 &data_size);
200 if (!flat_data) 186 if (!flat_data) return EINA_FALSE;
201 return EINA_FALSE; 187 if (_eet_connection_raw_send(conn, flat_data, data_size)) ret = EINA_TRUE;
202
203 if (_eet_connection_raw_send(conn, flat_data, data_size))
204 ret = EINA_TRUE;
205
206 free(flat_data); 188 free(flat_data);
207 return ret; 189 return ret;
208} /* eet_connection_send */ 190}
209 191
210EAPI Eina_Bool 192EAPI Eina_Bool
211eet_connection_node_send(Eet_Connection *conn, 193eet_connection_node_send(Eet_Connection *conn,
@@ -217,15 +199,12 @@ eet_connection_node_send(Eet_Connection *conn,
217 Eina_Bool ret = EINA_FALSE; 199 Eina_Bool ret = EINA_FALSE;
218 200
219 data = eet_data_node_encode_cipher(node, cipher_key, &data_size); 201 data = eet_data_node_encode_cipher(node, cipher_key, &data_size);
220 if (!data) 202 if (!data) return EINA_FALSE;
221 return EINA_FALSE;
222
223 if (_eet_connection_raw_send(conn, data, data_size)) 203 if (_eet_connection_raw_send(conn, data, data_size))
224 ret = EINA_TRUE; 204 ret = EINA_TRUE;
225
226 free(data); 205 free(data);
227 return ret; 206 return ret;
228} /* eet_connection_node_send */ 207}
229 208
230EAPI void * 209EAPI void *
231eet_connection_close(Eet_Connection *conn, 210eet_connection_close(Eet_Connection *conn,
@@ -233,17 +212,11 @@ eet_connection_close(Eet_Connection *conn,
233{ 212{
234 void *user_data; 213 void *user_data;
235 214
236 if (!conn) 215 if (!conn) return NULL;
237 return NULL; 216 if (on_going) *on_going = conn->received == 0 ? EINA_FALSE : EINA_TRUE;
238
239 if (on_going)
240 *on_going = conn->received == 0 ? EINA_FALSE : EINA_TRUE;
241
242 user_data = conn->user_data; 217 user_data = conn->user_data;
243
244 free(conn->buffer); 218 free(conn->buffer);
245 free(conn); 219 free(conn);
246
247 return user_data; 220 return user_data;
248} /* eet_connection_close */ 221}
249 222
diff --git a/libraries/eet/src/lib/eet_data.c b/libraries/eet/src/lib/eet_data.c
index 23b0b97..56b9ee0 100644
--- a/libraries/eet/src/lib/eet_data.c
+++ b/libraries/eet/src/lib/eet_data.c
@@ -651,7 +651,7 @@ eet_data_get_char(const Eet_Dictionary *ed __UNUSED__,
651 *d = *s; 651 *d = *s;
652 CONV8(*d); 652 CONV8(*d);
653 return sizeof(char); 653 return sizeof(char);
654} /* eet_data_get_char */ 654}
655 655
656static void * 656static void *
657eet_data_put_char(Eet_Dictionary *ed __UNUSED__, 657eet_data_put_char(Eet_Dictionary *ed __UNUSED__,
@@ -669,7 +669,7 @@ eet_data_put_char(Eet_Dictionary *ed __UNUSED__,
669 CONV8(*d); 669 CONV8(*d);
670 *size_ret = sizeof(char); 670 *size_ret = sizeof(char);
671 return d; 671 return d;
672} /* eet_data_put_char */ 672}
673 673
674/* SHORT TYPE */ 674/* SHORT TYPE */
675static int 675static int
@@ -687,7 +687,7 @@ eet_data_get_short(const Eet_Dictionary *ed __UNUSED__,
687 d = (short *)dst; 687 d = (short *)dst;
688 CONV16(*d); 688 CONV16(*d);
689 return sizeof(short); 689 return sizeof(short);
690} /* eet_data_get_short */ 690}
691 691
692static void * 692static void *
693eet_data_put_short(Eet_Dictionary *ed __UNUSED__, 693eet_data_put_short(Eet_Dictionary *ed __UNUSED__,
@@ -705,7 +705,7 @@ eet_data_put_short(Eet_Dictionary *ed __UNUSED__,
705 CONV16(*d); 705 CONV16(*d);
706 *size_ret = sizeof(short); 706 *size_ret = sizeof(short);
707 return d; 707 return d;
708} /* eet_data_put_short */ 708}
709 709
710/* INT TYPE */ 710/* INT TYPE */
711static inline int 711static inline int
@@ -723,7 +723,7 @@ eet_data_get_int(const Eet_Dictionary *ed __UNUSED__,
723 d = (int *)dst; 723 d = (int *)dst;
724 CONV32(*d); 724 CONV32(*d);
725 return sizeof(int); 725 return sizeof(int);
726} /* eet_data_get_int */ 726}
727 727
728static void * 728static void *
729eet_data_put_int(Eet_Dictionary *ed __UNUSED__, 729eet_data_put_int(Eet_Dictionary *ed __UNUSED__,
@@ -741,7 +741,7 @@ eet_data_put_int(Eet_Dictionary *ed __UNUSED__,
741 CONV32(*d); 741 CONV32(*d);
742 *size_ret = sizeof(int); 742 *size_ret = sizeof(int);
743 return d; 743 return d;
744} /* eet_data_put_int */ 744}
745 745
746/* LONG LONG TYPE */ 746/* LONG LONG TYPE */
747static int 747static int
@@ -759,7 +759,7 @@ eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__,
759 d = (unsigned long long *)dst; 759 d = (unsigned long long *)dst;
760 CONV64(*d); 760 CONV64(*d);
761 return sizeof(unsigned long long); 761 return sizeof(unsigned long long);
762} /* eet_data_get_long_long */ 762}
763 763
764static void * 764static void *
765eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__, 765eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__,
@@ -777,7 +777,7 @@ eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__,
777 CONV64(*d); 777 CONV64(*d);
778 *size_ret = sizeof(unsigned long long); 778 *size_ret = sizeof(unsigned long long);
779 return d; 779 return d;
780} /* eet_data_put_long_long */ 780}
781 781
782/* STRING TYPE */ 782/* STRING TYPE */
783static inline int 783static inline int
@@ -796,7 +796,7 @@ eet_data_get_string_hash(const Eet_Dictionary *ed,
796 } 796 }
797 797
798 return -1; 798 return -1;
799} /* eet_data_get_string_hash */ 799}
800 800
801static inline int 801static inline int
802eet_data_get_string(const Eet_Dictionary *ed, 802eet_data_get_string(const Eet_Dictionary *ed,
@@ -833,7 +833,7 @@ eet_data_get_string(const Eet_Dictionary *ed,
833 833
834 *d = s; 834 *d = s;
835 return strlen(s) + 1; 835 return strlen(s) + 1;
836} /* eet_data_get_string */ 836}
837 837
838static void * 838static void *
839eet_data_put_string(Eet_Dictionary *ed, 839eet_data_put_string(Eet_Dictionary *ed,
@@ -871,7 +871,7 @@ eet_data_put_string(Eet_Dictionary *ed,
871 memcpy(d, s, len + 1); 871 memcpy(d, s, len + 1);
872 *size_ret = len + 1; 872 *size_ret = len + 1;
873 return d; 873 return d;
874} /* eet_data_put_string */ 874}
875 875
876/* ALWAYS INLINED STRING TYPE */ 876/* ALWAYS INLINED STRING TYPE */
877static int 877static int
@@ -881,7 +881,7 @@ eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__,
881 void *dst) 881 void *dst)
882{ 882{
883 return eet_data_get_string(NULL, src, src_end, dst); 883 return eet_data_get_string(NULL, src, src_end, dst);
884} /* eet_data_get_istring */ 884}
885 885
886static void * 886static void *
887eet_data_put_istring(Eet_Dictionary *ed __UNUSED__, 887eet_data_put_istring(Eet_Dictionary *ed __UNUSED__,
@@ -889,7 +889,7 @@ eet_data_put_istring(Eet_Dictionary *ed __UNUSED__,
889 int *size_ret) 889 int *size_ret)
890{ 890{
891 return eet_data_put_string(NULL, src, size_ret); 891 return eet_data_put_string(NULL, src, size_ret);
892} /* eet_data_put_istring */ 892}
893 893
894/* ALWAYS NULL TYPE */ 894/* ALWAYS NULL TYPE */
895static int 895static int
@@ -904,7 +904,7 @@ eet_data_get_null(const Eet_Dictionary *ed __UNUSED__,
904 904
905 *d = NULL; 905 *d = NULL;
906 return 1; 906 return 1;
907} /* eet_data_get_null */ 907}
908 908
909static void * 909static void *
910eet_data_put_null(Eet_Dictionary *ed __UNUSED__, 910eet_data_put_null(Eet_Dictionary *ed __UNUSED__,
@@ -913,7 +913,7 @@ eet_data_put_null(Eet_Dictionary *ed __UNUSED__,
913{ 913{
914 *size_ret = 0; 914 *size_ret = 0;
915 return NULL; 915 return NULL;
916} /* eet_data_put_null */ 916}
917 917
918/** 918/**
919 * Fast lookups of simple doubles/floats. 919 * Fast lookups of simple doubles/floats.
@@ -941,7 +941,7 @@ _eet_data_float_cache_get(const char *s,
941 } 941 }
942 942
943 return 0; 943 return 0;
944} /* _eet_data_float_cache_get */ 944}
945 945
946static inline int 946static inline int
947_eet_data_double_cache_get(const char *s, 947_eet_data_double_cache_get(const char *s,
@@ -963,7 +963,7 @@ _eet_data_double_cache_get(const char *s,
963 } 963 }
964 964
965 return 0; 965 return 0;
966} /* _eet_data_double_cache_get */ 966}
967 967
968/* FLOAT TYPE */ 968/* FLOAT TYPE */
969static int 969static int
@@ -1006,7 +1006,7 @@ eet_data_get_float(const Eet_Dictionary *ed,
1006 return -1; 1006 return -1;
1007 1007
1008 return 1; 1008 return 1;
1009} /* eet_data_get_float */ 1009}
1010 1010
1011static void * 1011static void *
1012eet_data_put_float(Eet_Dictionary *ed, 1012eet_data_put_float(Eet_Dictionary *ed,
@@ -1038,7 +1038,7 @@ eet_data_put_float(Eet_Dictionary *ed,
1038 return NULL; 1038 return NULL;
1039 1039
1040 return eet_data_put_int(ed, &idx, size_ret); 1040 return eet_data_put_int(ed, &idx, size_ret);
1041} /* eet_data_put_float */ 1041}
1042 1042
1043/* DOUBLE TYPE */ 1043/* DOUBLE TYPE */
1044static int 1044static int
@@ -1082,7 +1082,7 @@ eet_data_get_double(const Eet_Dictionary *ed,
1082 return -1; 1082 return -1;
1083 1083
1084 return 1; 1084 return 1;
1085} /* eet_data_get_double */ 1085}
1086 1086
1087static void * 1087static void *
1088eet_data_put_double(Eet_Dictionary *ed, 1088eet_data_put_double(Eet_Dictionary *ed,
@@ -1115,7 +1115,7 @@ eet_data_put_double(Eet_Dictionary *ed,
1115 return NULL; 1115 return NULL;
1116 1116
1117 return eet_data_put_int(ed, &idx, size_ret); 1117 return eet_data_put_int(ed, &idx, size_ret);
1118} /* eet_data_put_double */ 1118}
1119 1119
1120static int 1120static int
1121eet_data_get_f32p32(const Eet_Dictionary *ed, 1121eet_data_get_f32p32(const Eet_Dictionary *ed,
@@ -1151,7 +1151,7 @@ eet_data_get_f32p32(const Eet_Dictionary *ed,
1151 return -1; 1151 return -1;
1152 1152
1153 return 1; 1153 return 1;
1154} /* eet_data_get_f32p32 */ 1154}
1155 1155
1156static void * 1156static void *
1157eet_data_put_f32p32(Eet_Dictionary *ed, 1157eet_data_put_f32p32(Eet_Dictionary *ed,
@@ -1184,7 +1184,7 @@ eet_data_put_f32p32(Eet_Dictionary *ed,
1184 return NULL; 1184 return NULL;
1185 1185
1186 return eet_data_put_int(ed, &idx, size_ret); 1186 return eet_data_put_int(ed, &idx, size_ret);
1187} /* eet_data_put_f32p32 */ 1187}
1188 1188
1189static int 1189static int
1190eet_data_get_f16p16(const Eet_Dictionary *ed, 1190eet_data_get_f16p16(const Eet_Dictionary *ed,
@@ -1202,7 +1202,7 @@ eet_data_get_f16p16(const Eet_Dictionary *ed,
1202 1202
1203 *fp = eina_f32p32_to_f16p16(tmp); 1203 *fp = eina_f32p32_to_f16p16(tmp);
1204 return 1; 1204 return 1;
1205} /* eet_data_get_f16p16 */ 1205}
1206 1206
1207static void * 1207static void *
1208eet_data_put_f16p16(Eet_Dictionary *ed, 1208eet_data_put_f16p16(Eet_Dictionary *ed,
@@ -1213,7 +1213,7 @@ eet_data_put_f16p16(Eet_Dictionary *ed,
1213 1213
1214 tmp = eina_f16p16_to_f32p32((Eina_F16p16)(*(Eina_F16p16 *)src)); 1214 tmp = eina_f16p16_to_f32p32((Eina_F16p16)(*(Eina_F16p16 *)src));
1215 return eet_data_put_f32p32(ed, &tmp, size_ret); 1215 return eet_data_put_f32p32(ed, &tmp, size_ret);
1216} /* eet_data_put_f16p16 */ 1216}
1217 1217
1218static int 1218static int
1219eet_data_get_f8p24(const Eet_Dictionary *ed, 1219eet_data_get_f8p24(const Eet_Dictionary *ed,
@@ -1231,7 +1231,7 @@ eet_data_get_f8p24(const Eet_Dictionary *ed,
1231 1231
1232 *fp = eina_f32p32_to_f8p24(tmp); 1232 *fp = eina_f32p32_to_f8p24(tmp);
1233 return 1; 1233 return 1;
1234} /* eet_data_get_f8p24 */ 1234}
1235 1235
1236static void * 1236static void *
1237eet_data_put_f8p24(Eet_Dictionary *ed, 1237eet_data_put_f8p24(Eet_Dictionary *ed,
@@ -1242,7 +1242,7 @@ eet_data_put_f8p24(Eet_Dictionary *ed,
1242 1242
1243 tmp = eina_f8p24_to_f32p32((Eina_F8p24)(*(Eina_F8p24 *)src)); 1243 tmp = eina_f8p24_to_f32p32((Eina_F8p24)(*(Eina_F8p24 *)src));
1244 return eet_data_put_f32p32(ed, &tmp, size_ret); 1244 return eet_data_put_f32p32(ed, &tmp, size_ret);
1245} /* eet_data_put_f8p24 */ 1245}
1246 1246
1247static inline int 1247static inline int
1248eet_data_get_type(const Eet_Dictionary *ed, 1248eet_data_get_type(const Eet_Dictionary *ed,
@@ -1255,7 +1255,7 @@ eet_data_get_type(const Eet_Dictionary *ed,
1255 1255
1256 ret = eet_basic_codec[type - 1].get(ed, src, src_end, dest); 1256 ret = eet_basic_codec[type - 1].get(ed, src, src_end, dest);
1257 return ret; 1257 return ret;
1258} /* eet_data_get_type */ 1258}
1259 1259
1260static inline void * 1260static inline void *
1261eet_data_put_type(Eet_Dictionary *ed, 1261eet_data_put_type(Eet_Dictionary *ed,
@@ -1267,7 +1267,7 @@ eet_data_put_type(Eet_Dictionary *ed,
1267 1267
1268 ret = eet_basic_codec[type - 1].put(ed, src, size_ret); 1268 ret = eet_basic_codec[type - 1].put(ed, src, size_ret);
1269 return ret; 1269 return ret;
1270} /* eet_data_put_type */ 1270}
1271 1271
1272static inline Eina_Bool 1272static inline Eina_Bool
1273eet_data_type_match(int type1, 1273eet_data_type_match(int type1,
@@ -1301,10 +1301,10 @@ eet_data_type_match(int type1,
1301 1301
1302 default: 1302 default:
1303 break; 1303 break;
1304 } /* switch */ 1304 }
1305 1305
1306 return EINA_FALSE; 1306 return EINA_FALSE;
1307} /* eet_data_type_match */ 1307}
1308 1308
1309/* chunk format... 1309/* chunk format...
1310 * 1310 *
@@ -1359,7 +1359,7 @@ case EET_I_ ## Type: chnk->type = EET_T_ ## Type; break;
1359 1359
1360 default: 1360 default:
1361 return; 1361 return;
1362 } /* switch */ 1362 }
1363 } 1363 }
1364 else if (chnk->type > EET_T_LAST) 1364 else if (chnk->type > EET_T_LAST)
1365 { 1365 {
@@ -1409,7 +1409,7 @@ case EET_I_ ## Type: chnk->type = EET_T_ ## Type; break;
1409 } 1409 }
1410 1410
1411 return; 1411 return;
1412} /* eet_data_chunk_get */ 1412}
1413 1413
1414static inline Eet_Data_Chunk * 1414static inline Eet_Data_Chunk *
1415eet_data_chunk_new(void *data, 1415eet_data_chunk_new(void *data,
@@ -1441,7 +1441,7 @@ eet_data_chunk_new(void *data,
1441 chnk->type = type; 1441 chnk->type = type;
1442 chnk->group_type = group_type; 1442 chnk->group_type = group_type;
1443 return chnk; 1443 return chnk;
1444} /* eet_data_chunk_new */ 1444}
1445 1445
1446static inline void 1446static inline void
1447eet_data_chunk_free(Eet_Data_Chunk *chnk) 1447eet_data_chunk_free(Eet_Data_Chunk *chnk)
@@ -1450,7 +1450,7 @@ eet_data_chunk_free(Eet_Data_Chunk *chnk)
1450 free(chnk->name); 1450 free(chnk->name);
1451 1451
1452 free(chnk); 1452 free(chnk);
1453} /* eet_data_chunk_free */ 1453}
1454 1454
1455static inline Eet_Data_Stream * 1455static inline Eet_Data_Stream *
1456eet_data_stream_new(void) 1456eet_data_stream_new(void)
@@ -1462,7 +1462,7 @@ eet_data_stream_new(void)
1462 return NULL; 1462 return NULL;
1463 1463
1464 return ds; 1464 return ds;
1465} /* eet_data_stream_new */ 1465}
1466 1466
1467static inline void 1467static inline void
1468eet_data_stream_free(Eet_Data_Stream *ds) 1468eet_data_stream_free(Eet_Data_Stream *ds)
@@ -1471,13 +1471,13 @@ eet_data_stream_free(Eet_Data_Stream *ds)
1471 free(ds->data); 1471 free(ds->data);
1472 1472
1473 free(ds); 1473 free(ds);
1474} /* eet_data_stream_free */ 1474}
1475 1475
1476static inline void 1476static inline void
1477eet_data_stream_flush(Eet_Data_Stream *ds) 1477eet_data_stream_flush(Eet_Data_Stream *ds)
1478{ 1478{
1479 free(ds); 1479 free(ds);
1480} /* eet_data_stream_flush */ 1480}
1481 1481
1482static inline void 1482static inline void
1483eet_data_stream_write(Eet_Data_Stream *ds, 1483eet_data_stream_write(Eet_Data_Stream *ds,
@@ -1502,7 +1502,7 @@ eet_data_stream_write(Eet_Data_Stream *ds,
1502 p = ds->data; 1502 p = ds->data;
1503 memcpy(p + ds->pos, data, size); 1503 memcpy(p + ds->pos, data, size);
1504 ds->pos += size; 1504 ds->pos += size;
1505} /* eet_data_stream_write */ 1505}
1506 1506
1507static void 1507static void
1508eet_data_chunk_put(Eet_Dictionary *ed, 1508eet_data_chunk_put(Eet_Dictionary *ed,
@@ -1541,7 +1541,7 @@ case EET_T_ ## Type: type += EET_I_ ## Type; break;
1541 1541
1542 default: 1542 default:
1543 return; 1543 return;
1544 } /* switch */ 1544 }
1545 1545
1546 buf[3] = type; 1546 buf[3] = type;
1547 } 1547 }
@@ -1578,7 +1578,7 @@ case EET_T_ ## Type: type += EET_I_ ## Type; break;
1578 free(string); 1578 free(string);
1579on_error: 1579on_error:
1580 free(size); 1580 free(size);
1581} /* eet_data_chunk_put */ 1581}
1582 1582
1583/*---*/ 1583/*---*/
1584 1584
@@ -1611,7 +1611,7 @@ _eet_descriptor_hash_new(Eet_Data_Descriptor *edd)
1611 edd->elements.hash.buckets[hash].next = bucket; 1611 edd->elements.hash.buckets[hash].next = bucket;
1612 } 1612 }
1613 } 1613 }
1614} /* _eet_descriptor_hash_new */ 1614}
1615 1615
1616static void 1616static void
1617_eet_descriptor_hash_free(Eet_Data_Descriptor *edd) 1617_eet_descriptor_hash_free(Eet_Data_Descriptor *edd)
@@ -1632,7 +1632,7 @@ _eet_descriptor_hash_free(Eet_Data_Descriptor *edd)
1632 } 1632 }
1633 if (edd->elements.hash.buckets) 1633 if (edd->elements.hash.buckets)
1634 free(edd->elements.hash.buckets); 1634 free(edd->elements.hash.buckets);
1635} /* _eet_descriptor_hash_free */ 1635}
1636 1636
1637static Eet_Data_Element * 1637static Eet_Data_Element *
1638_eet_descriptor_hash_find(Eet_Data_Descriptor *edd, 1638_eet_descriptor_hash_find(Eet_Data_Descriptor *edd,
@@ -1677,31 +1677,31 @@ _eet_descriptor_hash_find(Eet_Data_Descriptor *edd,
1677 bucket = bucket->next; 1677 bucket = bucket->next;
1678 } 1678 }
1679 return NULL; 1679 return NULL;
1680} /* _eet_descriptor_hash_find */ 1680}
1681 1681
1682static void * 1682static void *
1683_eet_mem_alloc(size_t size) 1683_eet_mem_alloc(size_t size)
1684{ 1684{
1685 return calloc(1, size); 1685 return calloc(1, size);
1686} /* _eet_mem_alloc */ 1686}
1687 1687
1688static void 1688static void
1689_eet_mem_free(void *mem) 1689_eet_mem_free(void *mem)
1690{ 1690{
1691 free(mem); 1691 free(mem);
1692} /* _eet_mem_free */ 1692}
1693 1693
1694static char * 1694static char *
1695_eet_str_alloc(const char *str) 1695_eet_str_alloc(const char *str)
1696{ 1696{
1697 return strdup(str); 1697 return strdup(str);
1698} /* _eet_str_alloc */ 1698}
1699 1699
1700static void 1700static void
1701_eet_str_free(const char *str) 1701_eet_str_free(const char *str)
1702{ 1702{
1703 free((char *)str); 1703 free((char *)str);
1704} /* _eet_str_free */ 1704}
1705 1705
1706static Eina_Hash * 1706static Eina_Hash *
1707_eet_eina_hash_add_alloc(Eina_Hash *hash, 1707_eet_eina_hash_add_alloc(Eina_Hash *hash,
@@ -1716,7 +1716,7 @@ _eet_eina_hash_add_alloc(Eina_Hash *hash,
1716 1716
1717 eina_hash_add(hash, key, data); 1717 eina_hash_add(hash, key, data);
1718 return hash; 1718 return hash;
1719} /* _eet_eina_hash_add_alloc */ 1719}
1720 1720
1721static Eina_Hash * 1721static Eina_Hash *
1722_eet_eina_hash_direct_add_alloc(Eina_Hash *hash, 1722_eet_eina_hash_direct_add_alloc(Eina_Hash *hash,
@@ -1731,18 +1731,18 @@ _eet_eina_hash_direct_add_alloc(Eina_Hash *hash,
1731 1731
1732 eina_hash_direct_add(hash, key, data); 1732 eina_hash_direct_add(hash, key, data);
1733 return hash; 1733 return hash;
1734} /* _eet_eina_hash_direct_add_alloc */ 1734}
1735 1735
1736static char * 1736static char *
1737_eet_str_direct_alloc(const char *str) 1737_eet_str_direct_alloc(const char *str)
1738{ 1738{
1739 return (char *)str; 1739 return (char *)str;
1740} /* _eet_str_direct_alloc */ 1740}
1741 1741
1742static void 1742static void
1743_eet_str_direct_free(const char *str __UNUSED__) 1743_eet_str_direct_free(const char *str __UNUSED__)
1744{ 1744{
1745} /* _eet_str_direct_free */ 1745}
1746 1746
1747static void 1747static void
1748_eet_eina_hash_foreach(void *hash, 1748_eet_eina_hash_foreach(void *hash,
@@ -1751,14 +1751,14 @@ _eet_eina_hash_foreach(void *hash,
1751{ 1751{
1752 if (hash) 1752 if (hash)
1753 eina_hash_foreach(hash, cb, fdata); 1753 eina_hash_foreach(hash, cb, fdata);
1754} /* _eet_eina_hash_foreach */ 1754}
1755 1755
1756static void 1756static void
1757_eet_eina_hash_free(void *hash) 1757_eet_eina_hash_free(void *hash)
1758{ 1758{
1759 if (hash) 1759 if (hash)
1760 eina_hash_free(hash); 1760 eina_hash_free(hash);
1761} /* _eet_eina_hash_free */ 1761}
1762 1762
1763/*---*/ 1763/*---*/
1764EAPI Eina_Bool 1764EAPI Eina_Bool
@@ -1792,7 +1792,7 @@ eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
1792 eddc->func.array_free = _eet_mem_free; 1792 eddc->func.array_free = _eet_mem_free;
1793 1793
1794 return EINA_TRUE; 1794 return EINA_TRUE;
1795} /* eet_eina_stream_data_descriptor_class_set */ 1795}
1796 1796
1797EAPI Eina_Bool 1797EAPI Eina_Bool
1798eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, 1798eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
@@ -1811,7 +1811,7 @@ eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
1811 eddc->func.str_direct_free = _eet_str_direct_free; 1811 eddc->func.str_direct_free = _eet_str_direct_free;
1812 1812
1813 return EINA_TRUE; 1813 return EINA_TRUE;
1814} /* eet_eina_file_data_descriptor_class_set */ 1814}
1815 1815
1816static Eet_Data_Descriptor * 1816static Eet_Data_Descriptor *
1817_eet_data_descriptor_new(const Eet_Data_Descriptor_Class *eddc, 1817_eet_data_descriptor_new(const Eet_Data_Descriptor_Class *eddc,
@@ -1872,7 +1872,7 @@ _eet_data_descriptor_new(const Eet_Data_Descriptor_Class *eddc,
1872 } 1872 }
1873 1873
1874 return edd; 1874 return edd;
1875} /* _eet_data_descriptor_new */ 1875}
1876 1876
1877EAPI Eet_Data_Descriptor * 1877EAPI Eet_Data_Descriptor *
1878eet_data_descriptor_new(const char *name, 1878eet_data_descriptor_new(const char *name,
@@ -1905,31 +1905,31 @@ eet_data_descriptor_new(const char *name,
1905 eddc.func.hash_free = func_hash_free; 1905 eddc.func.hash_free = func_hash_free;
1906 1906
1907 return _eet_data_descriptor_new(&eddc, 0); 1907 return _eet_data_descriptor_new(&eddc, 0);
1908} /* eet_data_descriptor_new */ 1908}
1909 1909
1910EAPI Eet_Data_Descriptor * 1910EAPI Eet_Data_Descriptor *
1911eet_data_descriptor2_new(const Eet_Data_Descriptor_Class *eddc) 1911eet_data_descriptor2_new(const Eet_Data_Descriptor_Class *eddc)
1912{ 1912{
1913 return _eet_data_descriptor_new(eddc, 1); 1913 return _eet_data_descriptor_new(eddc, 1);
1914} /* eet_data_descriptor2_new */ 1914}
1915 1915
1916EAPI Eet_Data_Descriptor * 1916EAPI Eet_Data_Descriptor *
1917eet_data_descriptor3_new(const Eet_Data_Descriptor_Class *eddc) 1917eet_data_descriptor3_new(const Eet_Data_Descriptor_Class *eddc)
1918{ 1918{
1919 return _eet_data_descriptor_new(eddc, 2); 1919 return _eet_data_descriptor_new(eddc, 2);
1920} /* eet_data_descriptor3_new */ 1920}
1921 1921
1922EAPI Eet_Data_Descriptor * 1922EAPI Eet_Data_Descriptor *
1923eet_data_descriptor_stream_new(const Eet_Data_Descriptor_Class *eddc) 1923eet_data_descriptor_stream_new(const Eet_Data_Descriptor_Class *eddc)
1924{ 1924{
1925 return _eet_data_descriptor_new(eddc, 1); 1925 return _eet_data_descriptor_new(eddc, 1);
1926} /* eet_data_descriptor_stream_new */ 1926}
1927 1927
1928EAPI Eet_Data_Descriptor * 1928EAPI Eet_Data_Descriptor *
1929eet_data_descriptor_file_new(const Eet_Data_Descriptor_Class *eddc) 1929eet_data_descriptor_file_new(const Eet_Data_Descriptor_Class *eddc)
1930{ 1930{
1931 return _eet_data_descriptor_new(eddc, 2); 1931 return _eet_data_descriptor_new(eddc, 2);
1932} /* eet_data_descriptor_file_new */ 1932}
1933 1933
1934EAPI void 1934EAPI void
1935eet_data_descriptor_free(Eet_Data_Descriptor *edd) 1935eet_data_descriptor_free(Eet_Data_Descriptor *edd)
@@ -1942,7 +1942,7 @@ eet_data_descriptor_free(Eet_Data_Descriptor *edd)
1942 free(edd->elements.set); 1942 free(edd->elements.set);
1943 1943
1944 free(edd); 1944 free(edd);
1945} /* eet_data_descriptor_free */ 1945}
1946 1946
1947EAPI void 1947EAPI void
1948eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, 1948eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
@@ -2039,7 +2039,7 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
2039 ede->counter_name = counter_name; 2039 ede->counter_name = counter_name;
2040 2040
2041 ede->subtype = subtype; 2041 ede->subtype = subtype;
2042} /* eet_data_descriptor_element_add */ 2042}
2043 2043
2044EAPI void * 2044EAPI void *
2045eet_data_read_cipher(Eet_File *ef, 2045eet_data_read_cipher(Eet_File *ef,
@@ -2075,7 +2075,7 @@ eet_data_read_cipher(Eet_File *ef,
2075 free((void *)data); 2075 free((void *)data);
2076 2076
2077 return data_dec; 2077 return data_dec;
2078} /* eet_data_read_cipher */ 2078}
2079 2079
2080EAPI Eet_Node * 2080EAPI Eet_Node *
2081eet_data_node_read_cipher(Eet_File *ef, 2081eet_data_node_read_cipher(Eet_File *ef,
@@ -2110,7 +2110,7 @@ eet_data_node_read_cipher(Eet_File *ef,
2110 free((void *)data); 2110 free((void *)data);
2111 2111
2112 return result; 2112 return result;
2113} /* eet_data_node_read_cipher */ 2113}
2114 2114
2115EAPI void * 2115EAPI void *
2116eet_data_read(Eet_File *ef, 2116eet_data_read(Eet_File *ef,
@@ -2118,7 +2118,7 @@ eet_data_read(Eet_File *ef,
2118 const char *name) 2118 const char *name)
2119{ 2119{
2120 return eet_data_read_cipher(ef, edd, name, NULL); 2120 return eet_data_read_cipher(ef, edd, name, NULL);
2121} /* eet_data_read */ 2121}
2122 2122
2123EAPI int 2123EAPI int
2124eet_data_write_cipher(Eet_File *ef, 2124eet_data_write_cipher(Eet_File *ef,
@@ -2142,7 +2142,7 @@ eet_data_write_cipher(Eet_File *ef,
2142 val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key); 2142 val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key);
2143 free(data_enc); 2143 free(data_enc);
2144 return val; 2144 return val;
2145} /* eet_data_write_cipher */ 2145}
2146 2146
2147EAPI int 2147EAPI int
2148eet_data_write(Eet_File *ef, 2148eet_data_write(Eet_File *ef,
@@ -2152,7 +2152,7 @@ eet_data_write(Eet_File *ef,
2152 int compress) 2152 int compress)
2153{ 2153{
2154 return eet_data_write_cipher(ef, edd, name, NULL, data, compress); 2154 return eet_data_write_cipher(ef, edd, name, NULL, data, compress);
2155} /* eet_data_write */ 2155}
2156 2156
2157static void 2157static void
2158eet_free_context_init(Eet_Free_Context *context) 2158eet_free_context_init(Eet_Free_Context *context)
@@ -2222,7 +2222,7 @@ _eet_free_hash(void *data)
2222#endif /* if defined (_WIN64) || ((!defined (_WIN32)) && (LONG_BIT != 32)) */ 2222#endif /* if defined (_WIN64) || ((!defined (_WIN32)) && (LONG_BIT != 32)) */
2223 2223
2224 return hash & 0xFF; 2224 return hash & 0xFF;
2225} /* _eet_free_hash */ 2225}
2226 2226
2227static void 2227static void
2228_eet_free_add(Eet_Free *ef, 2228_eet_free_add(Eet_Free *ef,
@@ -2240,7 +2240,7 @@ _eet_free_add(Eet_Free *ef,
2240 return; 2240 return;
2241 2241
2242 eina_array_push(&ef->list[hash], data); 2242 eina_array_push(&ef->list[hash], data);
2243} /* _eet_free_add */ 2243}
2244 2244
2245#if 0 2245#if 0
2246static void 2246static void
@@ -2274,19 +2274,19 @@ _eet_free_reset(Eet_Free *ef)
2274 2274
2275 for (i = 0; i < EET_FREE_COUNT; ++i) 2275 for (i = 0; i < EET_FREE_COUNT; ++i)
2276 eina_array_clean(&ef->list[i]); 2276 eina_array_clean(&ef->list[i]);
2277} /* _eet_free_reset */ 2277}
2278 2278
2279static void 2279static void
2280_eet_free_ref(Eet_Free *ef) 2280_eet_free_ref(Eet_Free *ef)
2281{ 2281{
2282 ef->ref++; 2282 ef->ref++;
2283} /* _eet_free_ref */ 2283}
2284 2284
2285static void 2285static void
2286_eet_free_unref(Eet_Free *ef) 2286_eet_free_unref(Eet_Free *ef)
2287{ 2287{
2288 ef->ref--; 2288 ef->ref--;
2289} /* _eet_free_unref */ 2289}
2290 2290
2291#define _eet_freelist_add(Ctx, Data) _eet_free_add(&Ctx->freelist, Data); 2291#define _eet_freelist_add(Ctx, Data) _eet_free_add(&Ctx->freelist, Data);
2292#define _eet_freelist_del(Ctx, Data) _eet_free_del(&Ctx->freelist, Data); 2292#define _eet_freelist_del(Ctx, Data) _eet_free_del(&Ctx->freelist, Data);
@@ -2316,7 +2316,7 @@ _eet_freelist_free(Eet_Free_Context *context,
2316 free(track); 2316 free(track);
2317 } 2317 }
2318 _eet_free_reset(&context->freelist); 2318 _eet_free_reset(&context->freelist);
2319} /* _eet_freelist_free */ 2319}
2320 2320
2321#define _eet_freelist_array_add(Ctx, Data) _eet_free_add(&Ctx->freelist_array, Data); 2321#define _eet_freelist_array_add(Ctx, Data) _eet_free_add(&Ctx->freelist_array, Data);
2322#define _eet_freelist_array_del(Ctx, Data) _eet_free_del(&Ctx->freelist_array, Data); 2322#define _eet_freelist_array_del(Ctx, Data) _eet_free_del(&Ctx->freelist_array, Data);
@@ -2351,7 +2351,7 @@ _eet_freelist_array_free(Eet_Free_Context *context,
2351 free(track); 2351 free(track);
2352 } 2352 }
2353 _eet_free_reset(&context->freelist_array); 2353 _eet_free_reset(&context->freelist_array);
2354} /* _eet_freelist_array_free */ 2354}
2355 2355
2356#define _eet_freelist_list_add(Ctx, Data) _eet_free_add(&Ctx->freelist_list, Data); 2356#define _eet_freelist_list_add(Ctx, Data) _eet_free_add(&Ctx->freelist_list, Data);
2357#define _eet_freelist_list_del(Ctx, Data) _eet_free_del(&Ctx->freelist_list, Data); 2357#define _eet_freelist_list_del(Ctx, Data) _eet_free_del(&Ctx->freelist_list, Data);
@@ -2379,7 +2379,7 @@ _eet_freelist_list_free(Eet_Free_Context *context,
2379 edd->func.list_free(*((void **)(track))); 2379 edd->func.list_free(*((void **)(track)));
2380 } 2380 }
2381 _eet_free_reset(&context->freelist_list); 2381 _eet_free_reset(&context->freelist_list);
2382} /* _eet_freelist_list_free */ 2382}
2383 2383
2384#define _eet_freelist_str_add(Ctx, Data) _eet_free_add(&Ctx->freelist_str, Data); 2384#define _eet_freelist_str_add(Ctx, Data) _eet_free_add(&Ctx->freelist_str, Data);
2385#define _eet_freelist_str_del(Ctx, Data) _eet_free_del(&Ctx->freelist_str, Data); 2385#define _eet_freelist_str_del(Ctx, Data) _eet_free_del(&Ctx->freelist_str, Data);
@@ -2409,7 +2409,7 @@ _eet_freelist_str_free(Eet_Free_Context *context,
2409 free(track); 2409 free(track);
2410 } 2410 }
2411 _eet_free_reset(&context->freelist_str); 2411 _eet_free_reset(&context->freelist_str);
2412} /* _eet_freelist_str_free */ 2412}
2413 2413
2414#define _eet_freelist_direct_str_add(Ctx, Data) _eet_free_add(&Ctx->freelist_direct_str, Data); 2414#define _eet_freelist_direct_str_add(Ctx, Data) _eet_free_add(&Ctx->freelist_direct_str, Data);
2415#define _eet_freelist_direct_str_del(Ctx, Data) _eet_free_del(&Ctx->freelist_direct_str, Data); 2415#define _eet_freelist_direct_str_del(Ctx, Data) _eet_free_del(&Ctx->freelist_direct_str, Data);
@@ -2439,7 +2439,7 @@ _eet_freelist_direct_str_free(Eet_Free_Context *context,
2439 free(track); 2439 free(track);
2440 } 2440 }
2441 _eet_free_reset(&context->freelist_direct_str); 2441 _eet_free_reset(&context->freelist_direct_str);
2442} /* _eet_freelist_direct_str_free */ 2442}
2443 2443
2444#define _eet_freelist_hash_add(Ctx, Data) _eet_free_add(&Ctx->freelist_hash, Data); 2444#define _eet_freelist_hash_add(Ctx, Data) _eet_free_add(&Ctx->freelist_hash, Data);
2445#define _eet_freelist_hash_del(Ctx, Data) _eet_free_del(&Ctx->freelist_hash, Data); 2445#define _eet_freelist_hash_del(Ctx, Data) _eet_free_del(&Ctx->freelist_hash, Data);
@@ -2469,7 +2469,7 @@ _eet_freelist_hash_free(Eet_Free_Context *context,
2469 free(track); 2469 free(track);
2470 } 2470 }
2471 _eet_free_reset(&context->freelist_hash); 2471 _eet_free_reset(&context->freelist_hash);
2472} /* _eet_freelist_hash_free */ 2472}
2473 2473
2474static void 2474static void
2475_eet_freelist_all_ref(Eet_Free_Context *freelist_context) 2475_eet_freelist_all_ref(Eet_Free_Context *freelist_context)
@@ -2479,7 +2479,7 @@ _eet_freelist_all_ref(Eet_Free_Context *freelist_context)
2479 _eet_freelist_list_ref(freelist_context); 2479 _eet_freelist_list_ref(freelist_context);
2480 _eet_freelist_hash_ref(freelist_context); 2480 _eet_freelist_hash_ref(freelist_context);
2481 _eet_freelist_direct_str_ref(freelist_context); 2481 _eet_freelist_direct_str_ref(freelist_context);
2482} /* _eet_freelist_all_ref */ 2482}
2483 2483
2484static void 2484static void
2485_eet_freelist_all_unref(Eet_Free_Context *freelist_context) 2485_eet_freelist_all_unref(Eet_Free_Context *freelist_context)
@@ -2489,7 +2489,7 @@ _eet_freelist_all_unref(Eet_Free_Context *freelist_context)
2489 _eet_freelist_list_unref(freelist_context); 2489 _eet_freelist_list_unref(freelist_context);
2490 _eet_freelist_hash_unref(freelist_context); 2490 _eet_freelist_hash_unref(freelist_context);
2491 _eet_freelist_direct_str_unref(freelist_context); 2491 _eet_freelist_direct_str_unref(freelist_context);
2492} /* _eet_freelist_all_unref */ 2492}
2493 2493
2494static int 2494static int
2495eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__, 2495eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__,
@@ -2556,7 +2556,7 @@ eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__,
2556 } 2556 }
2557 2557
2558 return 1; 2558 return 1;
2559} /* eet_data_descriptor_encode_hash_cb */ 2559}
2560 2560
2561static char * 2561static char *
2562_eet_data_dump_token_get(const char *src, 2562_eet_data_dump_token_get(const char *src,
@@ -2639,7 +2639,7 @@ _eet_data_dump_token_get(const char *src,
2639 free(tok); 2639 free(tok);
2640 2640
2641 return NULL; 2641 return NULL;
2642} /* _eet_data_dump_token_get */ 2642}
2643 2643
2644static void 2644static void
2645eet_data_encode(Eet_Dictionary *ed, 2645eet_data_encode(Eet_Dictionary *ed,
@@ -2663,7 +2663,7 @@ eet_data_encode(Eet_Dictionary *ed,
2663 eet_data_chunk_put(ed, echnk, ds); 2663 eet_data_chunk_put(ed, echnk, ds);
2664 eet_data_chunk_free(echnk); 2664 eet_data_chunk_free(echnk);
2665 free(data); 2665 free(data);
2666} /* eet_data_encode */ 2666}
2667 2667
2668static void * 2668static void *
2669_eet_data_dump_encode(int parent_type, 2669_eet_data_dump_encode(int parent_type,
@@ -2976,7 +2976,7 @@ case Eet_Type: \
2976 eet_data_chunk_free(chnk); 2976 eet_data_chunk_free(chnk);
2977 2977
2978 return cdata; 2978 return cdata;
2979} /* _eet_data_dump_encode */ 2979}
2980 2980
2981static void * 2981static void *
2982_eet_data_dump_parse(Eet_Dictionary *ed, 2982_eet_data_dump_parse(Eet_Dictionary *ed,
@@ -3238,7 +3238,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed,
3238 } 3238 }
3239 3239
3240 return cdata; 3240 return cdata;
3241} /* _eet_data_dump_parse */ 3241}
3242 3242
3243#define NEXT_CHUNK(P, Size, Echnk, Ed) \ 3243#define NEXT_CHUNK(P, Size, Echnk, Ed) \
3244 { \ 3244 { \
@@ -3352,7 +3352,7 @@ _eet_data_descriptor_decode(Eet_Free_Context *context,
3352 case EET_G_VARIANT: 3352 case EET_G_VARIANT:
3353 default: 3353 default:
3354 goto error; 3354 goto error;
3355 } /* switch */ 3355 }
3356 } 3356 }
3357 3357
3358 while (size > 0) 3358 while (size > 0)
@@ -3477,7 +3477,7 @@ error:
3477 3477
3478 /* FIXME: Warn that something goes wrong here. */ 3478 /* FIXME: Warn that something goes wrong here. */
3479 return NULL; 3479 return NULL;
3480} /* _eet_data_descriptor_decode */ 3480}
3481 3481
3482static int 3482static int
3483eet_data_get_list(Eet_Free_Context *context, 3483eet_data_get_list(Eet_Free_Context *context,
@@ -3544,7 +3544,7 @@ eet_data_get_list(Eet_Free_Context *context,
3544 3544
3545on_error: 3545on_error:
3546 return 0; 3546 return 0;
3547} /* eet_data_get_list */ 3547}
3548 3548
3549static int 3549static int
3550eet_data_get_hash(Eet_Free_Context *context, 3550eet_data_get_hash(Eet_Free_Context *context,
@@ -3629,7 +3629,7 @@ eet_data_get_hash(Eet_Free_Context *context,
3629 3629
3630on_error: 3630on_error:
3631 return 0; 3631 return 0;
3632} /* eet_data_get_hash */ 3632}
3633 3633
3634/* var arrays and fixed arrays have to 3634/* var arrays and fixed arrays have to
3635 * get all chunks at once. for fixed arrays 3635 * get all chunks at once. for fixed arrays
@@ -3793,7 +3793,7 @@ on_error:
3793 eet_node_del(tmp); 3793 eet_node_del(tmp);
3794 3794
3795 return 0; 3795 return 0;
3796} /* eet_data_get_array */ 3796}
3797 3797
3798static void 3798static void
3799eet_data_put_union(Eet_Dictionary *ed, 3799eet_data_put_union(Eet_Dictionary *ed,
@@ -3849,7 +3849,7 @@ eet_data_put_union(Eet_Dictionary *ed,
3849 3849
3850 break; 3850 break;
3851 } 3851 }
3852} /* eet_data_put_union */ 3852}
3853 3853
3854static int 3854static int
3855eet_data_get_union(Eet_Free_Context *context, 3855eet_data_get_union(Eet_Free_Context *context,
@@ -3947,7 +3947,7 @@ eet_data_get_union(Eet_Free_Context *context,
3947 3947
3948on_error: 3948on_error:
3949 return 0; 3949 return 0;
3950} /* eet_data_get_union */ 3950}
3951 3951
3952static void 3952static void
3953eet_data_put_variant(Eet_Dictionary *ed, 3953eet_data_put_variant(Eet_Dictionary *ed,
@@ -4058,7 +4058,7 @@ eet_data_put_variant(Eet_Dictionary *ed,
4058 4058
4059 break; 4059 break;
4060 } 4060 }
4061} /* eet_data_put_variant */ 4061}
4062 4062
4063static int 4063static int
4064eet_data_get_variant(Eet_Free_Context *context, 4064eet_data_get_variant(Eet_Free_Context *context,
@@ -4213,7 +4213,7 @@ eet_data_get_variant(Eet_Free_Context *context,
4213 4213
4214on_error: 4214on_error:
4215 return 0; 4215 return 0;
4216} /* eet_data_get_variant */ 4216}
4217 4217
4218static Eet_Node * 4218static Eet_Node *
4219eet_data_node_simple_type(int type, 4219eet_data_node_simple_type(int type,
@@ -4249,8 +4249,8 @@ case Eet_Type: \
4249 default: 4249 default:
4250 ERR("Unknow type passed to eet_data_node_simple_type"); 4250 ERR("Unknow type passed to eet_data_node_simple_type");
4251 return NULL; 4251 return NULL;
4252 } /* switch */ 4252 }
4253} /* eet_data_node_simple_type */ 4253}
4254 4254
4255static int 4255static int
4256eet_data_get_unknown(Eet_Free_Context *context, 4256eet_data_get_unknown(Eet_Free_Context *context,
@@ -4366,7 +4366,7 @@ eet_data_get_unknown(Eet_Free_Context *context,
4366 } 4366 }
4367 4367
4368 return 1; 4368 return 1;
4369} /* eet_data_get_unknown */ 4369}
4370 4370
4371static void 4371static void
4372eet_data_put_array(Eet_Dictionary *ed, 4372eet_data_put_array(Eet_Dictionary *ed,
@@ -4442,7 +4442,7 @@ eet_data_put_array(Eet_Dictionary *ed,
4442 4442
4443 offset += subsize; 4443 offset += subsize;
4444 } 4444 }
4445} /* eet_data_put_array */ 4445}
4446 4446
4447static void 4447static void
4448eet_data_put_unknown(Eet_Dictionary *ed, 4448eet_data_put_unknown(Eet_Dictionary *ed,
@@ -4471,7 +4471,7 @@ eet_data_put_unknown(Eet_Dictionary *ed,
4471 size, 4471 size,
4472 ede->type, 4472 ede->type,
4473 ede->group_type); 4473 ede->group_type);
4474} /* eet_data_put_unknown */ 4474}
4475 4475
4476static void 4476static void
4477eet_data_put_list(Eet_Dictionary *ed, 4477eet_data_put_list(Eet_Dictionary *ed,
@@ -4512,7 +4512,7 @@ eet_data_put_list(Eet_Dictionary *ed,
4512 ede->group_type); 4512 ede->group_type);
4513 } 4513 }
4514 } 4514 }
4515} /* eet_data_put_list */ 4515}
4516 4516
4517static void 4517static void
4518eet_data_put_hash(Eet_Dictionary *ed, 4518eet_data_put_hash(Eet_Dictionary *ed,
@@ -4529,7 +4529,7 @@ eet_data_put_hash(Eet_Dictionary *ed,
4529 fdata.ede = ede; 4529 fdata.ede = ede;
4530 fdata.ed = ed; 4530 fdata.ed = ed;
4531 edd->func.hash_foreach(l, eet_data_descriptor_encode_hash_cb, &fdata); 4531 edd->func.hash_foreach(l, eet_data_descriptor_encode_hash_cb, &fdata);
4532} /* eet_data_put_hash */ 4532}
4533 4533
4534EAPI int 4534EAPI int
4535eet_data_dump_cipher(Eet_File *ef, 4535eet_data_dump_cipher(Eet_File *ef,
@@ -4570,7 +4570,7 @@ eet_data_dump_cipher(Eet_File *ef,
4570 free((void *)data); 4570 free((void *)data);
4571 4571
4572 return result ? 1 : 0; 4572 return result ? 1 : 0;
4573} /* eet_data_dump_cipher */ 4573}
4574 4574
4575EAPI int 4575EAPI int
4576eet_data_dump(Eet_File *ef, 4576eet_data_dump(Eet_File *ef,
@@ -4579,7 +4579,7 @@ eet_data_dump(Eet_File *ef,
4579 void *dumpdata) 4579 void *dumpdata)
4580{ 4580{
4581 return eet_data_dump_cipher(ef, name, NULL, dumpfunc, dumpdata); 4581 return eet_data_dump_cipher(ef, name, NULL, dumpfunc, dumpdata);
4582} /* eet_data_dump */ 4582}
4583 4583
4584EAPI int 4584EAPI int
4585eet_data_text_dump_cipher(const void *data_in, 4585eet_data_text_dump_cipher(const void *data_in,
@@ -4624,7 +4624,7 @@ eet_data_text_dump_cipher(const void *data_in,
4624 free(ret); 4624 free(ret);
4625 4625
4626 return result ? 1 : 0; 4626 return result ? 1 : 0;
4627} /* eet_data_text_dump_cipher */ 4627}
4628 4628
4629EAPI int 4629EAPI int
4630eet_data_text_dump(const void *data_in, 4630eet_data_text_dump(const void *data_in,
@@ -4633,7 +4633,7 @@ eet_data_text_dump(const void *data_in,
4633 void *dumpdata) 4633 void *dumpdata)
4634{ 4634{
4635 return eet_data_text_dump_cipher(data_in, NULL, size_in, dumpfunc, dumpdata); 4635 return eet_data_text_dump_cipher(data_in, NULL, size_in, dumpfunc, dumpdata);
4636} /* eet_data_text_dump */ 4636}
4637 4637
4638EAPI void * 4638EAPI void *
4639eet_data_text_undump_cipher(const char *text, 4639eet_data_text_undump_cipher(const char *text,
@@ -4666,7 +4666,7 @@ eet_data_text_undump_cipher(const char *text,
4666 } 4666 }
4667 4667
4668 return ret; 4668 return ret;
4669} /* eet_data_text_undump_cipher */ 4669}
4670 4670
4671EAPI void * 4671EAPI void *
4672eet_data_text_undump(const char *text, 4672eet_data_text_undump(const char *text,
@@ -4674,7 +4674,7 @@ eet_data_text_undump(const char *text,
4674 int *size_ret) 4674 int *size_ret)
4675{ 4675{
4676 return eet_data_text_undump_cipher(text, NULL, textlen, size_ret); 4676 return eet_data_text_undump_cipher(text, NULL, textlen, size_ret);
4677} /* eet_data_text_undump */ 4677}
4678 4678
4679EAPI int 4679EAPI int
4680eet_data_undump_cipher(Eet_File *ef, 4680eet_data_undump_cipher(Eet_File *ef,
@@ -4698,7 +4698,7 @@ eet_data_undump_cipher(Eet_File *ef,
4698 val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key); 4698 val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key);
4699 free(data_enc); 4699 free(data_enc);
4700 return val; 4700 return val;
4701} /* eet_data_undump_cipher */ 4701}
4702 4702
4703EAPI int 4703EAPI int
4704eet_data_undump(Eet_File *ef, 4704eet_data_undump(Eet_File *ef,
@@ -4708,7 +4708,7 @@ eet_data_undump(Eet_File *ef,
4708 int compress) 4708 int compress)
4709{ 4709{
4710 return eet_data_undump_cipher(ef, name, NULL, text, textlen, compress); 4710 return eet_data_undump_cipher(ef, name, NULL, text, textlen, compress);
4711} /* eet_data_undump */ 4711}
4712 4712
4713EAPI void * 4713EAPI void *
4714eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd, 4714eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
@@ -4744,7 +4744,7 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
4744 free(deciphered); 4744 free(deciphered);
4745 4745
4746 return ret; 4746 return ret;
4747} /* eet_data_descriptor_decode_cipher */ 4747}
4748 4748
4749EAPI void * 4749EAPI void *
4750eet_data_descriptor_decode(Eet_Data_Descriptor *edd, 4750eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
@@ -4752,7 +4752,7 @@ eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
4752 int size_in) 4752 int size_in)
4753{ 4753{
4754 return eet_data_descriptor_decode_cipher(edd, data_in, NULL, size_in); 4754 return eet_data_descriptor_decode_cipher(edd, data_in, NULL, size_in);
4755} /* eet_data_descriptor_decode */ 4755}
4756 4756
4757EAPI Eet_Node * 4757EAPI Eet_Node *
4758eet_data_node_decode_cipher(const void *data_in, 4758eet_data_node_decode_cipher(const void *data_in,
@@ -4787,7 +4787,7 @@ eet_data_node_decode_cipher(const void *data_in,
4787 free(deciphered); 4787 free(deciphered);
4788 4788
4789 return ret; 4789 return ret;
4790} /* eet_data_node_decode_cipher */ 4790}
4791 4791
4792static void * 4792static void *
4793_eet_data_descriptor_encode(Eet_Dictionary *ed, 4793_eet_data_descriptor_encode(Eet_Dictionary *ed,
@@ -4849,7 +4849,7 @@ _eet_data_descriptor_encode(Eet_Dictionary *ed,
4849 eet_data_chunk_free(chnk); 4849 eet_data_chunk_free(chnk);
4850 4850
4851 return cdata; 4851 return cdata;
4852} /* _eet_data_descriptor_encode */ 4852}
4853 4853
4854EAPI int 4854EAPI int
4855eet_data_node_write_cipher(Eet_File *ef, 4855eet_data_node_write_cipher(Eet_File *ef,
@@ -4872,7 +4872,7 @@ eet_data_node_write_cipher(Eet_File *ef,
4872 val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key); 4872 val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key);
4873 free(data_enc); 4873 free(data_enc);
4874 return val; 4874 return val;
4875} /* eet_data_node_write_cipher */ 4875}
4876 4876
4877EAPI void * 4877EAPI void *
4878eet_data_node_encode_cipher(Eet_Node *node, 4878eet_data_node_encode_cipher(Eet_Node *node,
@@ -4909,7 +4909,7 @@ eet_data_node_encode_cipher(Eet_Node *node,
4909 *size_ret = size; 4909 *size_ret = size;
4910 4910
4911 return ret; 4911 return ret;
4912} /* eet_data_node_encode_cipher */ 4912}
4913 4913
4914EAPI void * 4914EAPI void *
4915eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd, 4915eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd,
@@ -4947,7 +4947,7 @@ eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd,
4947 *size_ret = size; 4947 *size_ret = size;
4948 4948
4949 return ret; 4949 return ret;
4950} /* eet_data_descriptor_encode_cipher */ 4950}
4951 4951
4952EAPI void * 4952EAPI void *
4953eet_data_descriptor_encode(Eet_Data_Descriptor *edd, 4953eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
@@ -4955,7 +4955,7 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
4955 int *size_ret) 4955 int *size_ret)
4956{ 4956{
4957 return eet_data_descriptor_encode_cipher(edd, data_in, NULL, size_ret); 4957 return eet_data_descriptor_encode_cipher(edd, data_in, NULL, size_ret);
4958} /* eet_data_descriptor_encode */ 4958}
4959 4959
4960EAPI void * 4960EAPI void *
4961eet_data_xattr_cipher_get(const char *filename, 4961eet_data_xattr_cipher_get(const char *filename,
diff --git a/libraries/eet/src/lib/eet_dictionary.c b/libraries/eet/src/lib/eet_dictionary.c
index 60d0ec1..287860d 100644
--- a/libraries/eet/src/lib/eet_dictionary.c
+++ b/libraries/eet/src/lib/eet_dictionary.c
@@ -16,34 +16,33 @@ eet_dictionary_add(void)
16{ 16{
17 Eet_Dictionary *new; 17 Eet_Dictionary *new;
18 18
19 new = calloc(1, sizeof (Eet_Dictionary)); 19 new = eet_dictionary_calloc(1);
20 if (!new) 20 if (!new)
21 return NULL; 21 return NULL;
22 22
23 memset(new->hash, -1, sizeof (int) * 256); 23 memset(new->hash, -1, sizeof (int) * 256);
24 24
25 return new; 25 return new;
26} /* eet_dictionary_add */ 26}
27 27
28void 28void
29eet_dictionary_free(Eet_Dictionary *ed) 29eet_dictionary_free(Eet_Dictionary *ed)
30{ 30{
31 if (ed) 31 int i;
32 {
33 int i;
34 32
35 for (i = 0; i < ed->count; ++i) 33 if (!ed) return;
36 if (ed->all[i].allocated)
37 eina_stringshare_del(ed->all[i].str);
38 34
39 if (ed->all) 35 for (i = 0; i < ed->count; ++i)
40 free(ed->all); 36 if (ed->all[i].allocated)
37 eina_stringshare_del(ed->all[i].str);
41 38
42 if (ed->converts) eina_hash_free(ed->converts); 39 if (ed->all)
40 free(ed->all);
43 41
44 free(ed); 42 if (ed->converts) eina_hash_free(ed->converts);
45 } 43
46} /* eet_dictionary_free */ 44 eet_dictionary_mp_free(ed);
45}
47 46
48static int 47static int
49_eet_dictionary_lookup(Eet_Dictionary *ed, 48_eet_dictionary_lookup(Eet_Dictionary *ed,
@@ -77,7 +76,7 @@ _eet_dictionary_lookup(Eet_Dictionary *ed,
77 return prev; 76 return prev;
78 77
79 return current; 78 return current;
80} /* _eet_dictionary_lookup */ 79}
81 80
82int 81int
83eet_dictionary_string_add(Eet_Dictionary *ed, 82eet_dictionary_string_add(Eet_Dictionary *ed,
@@ -110,7 +109,7 @@ eet_dictionary_string_add(Eet_Dictionary *ed,
110 109
111 total = ed->total + 8; 110 total = ed->total + 8;
112 111
113 new = realloc(ed->all, sizeof (Eet_String) * total); 112 new = realloc(ed->all, total * sizeof(Eet_String));
114 if (!new) 113 if (!new)
115 return -1; 114 return -1;
116 115
@@ -152,7 +151,7 @@ eet_dictionary_string_add(Eet_Dictionary *ed,
152 } 151 }
153 152
154 return ed->count++; 153 return ed->count++;
155} /* eet_dictionary_string_add */ 154}
156 155
157int 156int
158eet_dictionary_string_get_size(const Eet_Dictionary *ed, 157eet_dictionary_string_get_size(const Eet_Dictionary *ed,
@@ -168,7 +167,7 @@ eet_dictionary_string_get_size(const Eet_Dictionary *ed,
168 return ed->all[idx].len; 167 return ed->all[idx].len;
169 168
170 return 0; 169 return 0;
171} /* eet_dictionary_string_get_size */ 170}
172 171
173int 172int
174eet_dictionary_string_get_hash(const Eet_Dictionary *ed, 173eet_dictionary_string_get_hash(const Eet_Dictionary *ed,
@@ -184,7 +183,7 @@ eet_dictionary_string_get_hash(const Eet_Dictionary *ed,
184 return ed->all[idx].hash; 183 return ed->all[idx].hash;
185 184
186 return -1; 185 return -1;
187} /* eet_dictionary_string_get_hash */ 186}
188 187
189const char * 188const char *
190eet_dictionary_string_get_char(const Eet_Dictionary *ed, 189eet_dictionary_string_get_char(const Eet_Dictionary *ed,
@@ -210,7 +209,7 @@ eet_dictionary_string_get_char(const Eet_Dictionary *ed,
210 } 209 }
211 210
212 return NULL; 211 return NULL;
213} /* eet_dictionary_string_get_char */ 212}
214 213
215static inline Eina_Bool 214static inline Eina_Bool
216_eet_dictionary_string_get_me_cache(const char *s, 215_eet_dictionary_string_get_me_cache(const char *s,
@@ -227,7 +226,7 @@ _eet_dictionary_string_get_me_cache(const char *s,
227 } 226 }
228 227
229 return EINA_FALSE; 228 return EINA_FALSE;
230} /* _eet_dictionary_string_get_me_cache */ 229}
231 230
232static inline Eina_Bool 231static inline Eina_Bool
233_eet_dictionary_string_get_float_cache(const char *s, 232_eet_dictionary_string_get_float_cache(const char *s,
@@ -248,7 +247,7 @@ _eet_dictionary_string_get_float_cache(const char *s,
248 } 247 }
249 248
250 return EINA_FALSE; 249 return EINA_FALSE;
251} /* _eet_dictionary_string_get_float_cache */ 250}
252 251
253static inline Eina_Bool 252static inline Eina_Bool
254_eet_dictionary_string_get_double_cache(const char *s, 253_eet_dictionary_string_get_double_cache(const char *s,
@@ -269,7 +268,7 @@ _eet_dictionary_string_get_double_cache(const char *s,
269 } 268 }
270 269
271 return EINA_FALSE; 270 return EINA_FALSE;
272} /* _eet_dictionary_string_get_double_cache */ 271}
273 272
274static inline Eina_Bool 273static inline Eina_Bool
275_eet_dictionary_test(const Eet_Dictionary *ed, 274_eet_dictionary_test(const Eet_Dictionary *ed,
@@ -289,7 +288,7 @@ _eet_dictionary_test(const Eet_Dictionary *ed,
289 return EINA_FALSE; 288 return EINA_FALSE;
290 289
291 return EINA_TRUE; 290 return EINA_TRUE;
292} /* _eet_dictionary_test */ 291}
293 292
294static Eet_Convert * 293static Eet_Convert *
295eet_dictionary_convert_get(const Eet_Dictionary *ed, 294eet_dictionary_convert_get(const Eet_Dictionary *ed,
@@ -351,7 +350,7 @@ eet_dictionary_string_get_float(const Eet_Dictionary *ed,
351 350
352 *result = convert->f; 351 *result = convert->f;
353 return EINA_TRUE; 352 return EINA_TRUE;
354} /* eet_dictionary_string_get_float */ 353}
355 354
356Eina_Bool 355Eina_Bool
357eet_dictionary_string_get_double(const Eet_Dictionary *ed, 356eet_dictionary_string_get_double(const Eet_Dictionary *ed,
@@ -387,7 +386,7 @@ eet_dictionary_string_get_double(const Eet_Dictionary *ed,
387 386
388 *result = convert->d; 387 *result = convert->d;
389 return EINA_TRUE; 388 return EINA_TRUE;
390} /* eet_dictionary_string_get_double */ 389}
391 390
392Eina_Bool 391Eina_Bool
393eet_dictionary_string_get_fp(const Eet_Dictionary *ed, 392eet_dictionary_string_get_fp(const Eet_Dictionary *ed,
@@ -416,7 +415,7 @@ eet_dictionary_string_get_fp(const Eet_Dictionary *ed,
416 415
417 *result = convert->fp; 416 *result = convert->fp;
418 return EINA_TRUE; 417 return EINA_TRUE;
419} /* eet_dictionary_string_get_fp */ 418}
420 419
421EAPI int 420EAPI int
422eet_dictionary_string_check(Eet_Dictionary *ed, 421eet_dictionary_string_check(Eet_Dictionary *ed,
@@ -435,5 +434,5 @@ eet_dictionary_string_check(Eet_Dictionary *ed,
435 return 1; 434 return 1;
436 435
437 return 0; 436 return 0;
438} /* eet_dictionary_string_check */ 437}
439 438
diff --git a/libraries/eet/src/lib/eet_image.c b/libraries/eet/src/lib/eet_image.c
index 79f6f90..8c6c03c 100644
--- a/libraries/eet/src/lib/eet_image.c
+++ b/libraries/eet/src/lib/eet_image.c
@@ -66,7 +66,7 @@ _eet_jpeg_membuf_src_init(j_decompress_ptr cinfo)
66{ 66{
67 /* FIXME: Use attribute unused */ 67 /* FIXME: Use attribute unused */
68 (void)cinfo; 68 (void)cinfo;
69} /* _eet_jpeg_membuf_src_init */ 69}
70 70
71static boolean 71static boolean
72_eet_jpeg_membuf_src_fill(j_decompress_ptr cinfo) 72_eet_jpeg_membuf_src_fill(j_decompress_ptr cinfo)
@@ -78,7 +78,7 @@ _eet_jpeg_membuf_src_fill(j_decompress_ptr cinfo)
78 src->pub.next_input_byte = jpeg_eoi; 78 src->pub.next_input_byte = jpeg_eoi;
79 79
80 return TRUE; 80 return TRUE;
81} /* _eet_jpeg_membuf_src_fill */ 81}
82 82
83static void 83static void
84_eet_jpeg_membuf_src_skip(j_decompress_ptr cinfo, 84_eet_jpeg_membuf_src_skip(j_decompress_ptr cinfo,
@@ -88,7 +88,7 @@ _eet_jpeg_membuf_src_skip(j_decompress_ptr cinfo,
88 88
89 src->pub.bytes_in_buffer -= num_bytes; 89 src->pub.bytes_in_buffer -= num_bytes;
90 src->pub.next_input_byte += num_bytes; 90 src->pub.next_input_byte += num_bytes;
91} /* _eet_jpeg_membuf_src_skip */ 91}
92 92
93static void 93static void
94_eet_jpeg_membuf_src_term(j_decompress_ptr cinfo) 94_eet_jpeg_membuf_src_term(j_decompress_ptr cinfo)
@@ -97,7 +97,7 @@ _eet_jpeg_membuf_src_term(j_decompress_ptr cinfo)
97 97
98 free(src); 98 free(src);
99 cinfo->src = NULL; 99 cinfo->src = NULL;
100} /* _eet_jpeg_membuf_src_term */ 100}
101 101
102static int 102static int
103eet_jpeg_membuf_src(j_decompress_ptr cinfo, 103eet_jpeg_membuf_src(j_decompress_ptr cinfo,
@@ -124,7 +124,7 @@ eet_jpeg_membuf_src(j_decompress_ptr cinfo,
124 src->pub.next_input_byte = src->buf; 124 src->pub.next_input_byte = src->buf;
125 125
126 return 0; 126 return 0;
127} /* eet_jpeg_membuf_src */ 127}
128 128
129struct jpeg_membuf_dst 129struct jpeg_membuf_dst
130{ 130{
@@ -144,7 +144,7 @@ _eet_jpeg_membuf_dst_init(j_compress_ptr cinfo)
144{ 144{
145 /* FIXME: Use eina attribute */ 145 /* FIXME: Use eina attribute */
146 (void)cinfo; 146 (void)cinfo;
147} /* _eet_jpeg_membuf_dst_init */ 147}
148 148
149static boolean 149static boolean
150_eet_jpeg_membuf_dst_flush(j_compress_ptr cinfo) 150_eet_jpeg_membuf_dst_flush(j_compress_ptr cinfo)
@@ -168,7 +168,7 @@ _eet_jpeg_membuf_dst_flush(j_compress_ptr cinfo)
168 dst->len *= 2; 168 dst->len *= 2;
169 169
170 return FALSE; 170 return FALSE;
171} /* _eet_jpeg_membuf_dst_flush */ 171}
172 172
173static void 173static void
174_eet_jpeg_membuf_dst_term(j_compress_ptr cinfo) 174_eet_jpeg_membuf_dst_term(j_compress_ptr cinfo)
@@ -189,7 +189,7 @@ _eet_jpeg_membuf_dst_term(j_compress_ptr cinfo)
189 189
190 free(dst); 190 free(dst);
191 cinfo->dest = NULL; 191 cinfo->dest = NULL;
192} /* _eet_jpeg_membuf_dst_term */ 192}
193 193
194static int 194static int
195eet_jpeg_membuf_dst(j_compress_ptr cinfo, 195eet_jpeg_membuf_dst(j_compress_ptr cinfo,
@@ -223,7 +223,7 @@ eet_jpeg_membuf_dst(j_compress_ptr cinfo,
223 dst->failed = 0; 223 dst->failed = 0;
224 224
225 return 0; 225 return 0;
226} /* eet_jpeg_membuf_dst */ 226}
227 227
228/*---*/ 228/*---*/
229 229
@@ -336,7 +336,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo)
336 /* cinfo->err->output_message(cinfo);*/ 336 /* cinfo->err->output_message(cinfo);*/
337 longjmp(errmgr->setjmp_buffer, 1); 337 longjmp(errmgr->setjmp_buffer, 1);
338 return; 338 return;
339} /* _JPEGFatalErrorHandler */ 339}
340 340
341static void 341static void
342_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__) 342_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
@@ -347,7 +347,7 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
347 /* cinfo->err->output_message(cinfo);*/ 347 /* cinfo->err->output_message(cinfo);*/
348 /* longjmp(errmgr->setjmp_buffer, 1);*/ 348 /* longjmp(errmgr->setjmp_buffer, 1);*/
349 return; 349 return;
350} /* _JPEGErrorHandler */ 350}
351 351
352static void 352static void
353_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__, 353_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__,
@@ -359,7 +359,7 @@ _JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__,
359 /* cinfo->err->output_message(cinfo);*/ 359 /* cinfo->err->output_message(cinfo);*/
360 /* longjmp(errmgr->setjmp_buffer, 1);*/ 360 /* longjmp(errmgr->setjmp_buffer, 1);*/
361 return; 361 return;
362} /* _JPEGErrorHandler2 */ 362}
363 363
364static int 364static int
365eet_data_image_jpeg_header_decode(const void *data, 365eet_data_image_jpeg_header_decode(const void *data,
@@ -405,7 +405,7 @@ eet_data_image_jpeg_header_decode(const void *data,
405 return 0; 405 return 0;
406 406
407 return 1; 407 return 1;
408} /* eet_data_image_jpeg_header_decode */ 408}
409 409
410static int 410static int
411eet_data_image_jpeg_rgb_decode(const void *data, 411eet_data_image_jpeg_rgb_decode(const void *data,
@@ -558,7 +558,7 @@ eet_data_image_jpeg_rgb_decode(const void *data,
558 jpeg_finish_decompress(&cinfo); 558 jpeg_finish_decompress(&cinfo);
559 jpeg_destroy_decompress(&cinfo); 559 jpeg_destroy_decompress(&cinfo);
560 return 1; 560 return 1;
561} /* eet_data_image_jpeg_rgb_decode */ 561}
562 562
563static void * 563static void *
564eet_data_image_jpeg_alpha_decode(const void *data, 564eet_data_image_jpeg_alpha_decode(const void *data,
@@ -667,7 +667,7 @@ eet_data_image_jpeg_alpha_decode(const void *data,
667 jpeg_finish_decompress(&cinfo); 667 jpeg_finish_decompress(&cinfo);
668 jpeg_destroy_decompress(&cinfo); 668 jpeg_destroy_decompress(&cinfo);
669 return d; 669 return d;
670} /* eet_data_image_jpeg_alpha_decode */ 670}
671 671
672static void * 672static void *
673eet_data_image_lossless_convert(int *size, 673eet_data_image_lossless_convert(int *size,
@@ -715,7 +715,7 @@ eet_data_image_lossless_convert(int *size,
715 *size = ((w * h * 4) + (8 * 4)); 715 *size = ((w * h * 4) + (8 * 4));
716 return d; 716 return d;
717 } 717 }
718} /* eet_data_image_lossless_convert */ 718}
719 719
720static void * 720static void *
721eet_data_image_lossless_compressed_convert(int *size, 721eet_data_image_lossless_compressed_convert(int *size,
@@ -789,7 +789,7 @@ eet_data_image_lossless_compressed_convert(int *size,
789 free(comp); 789 free(comp);
790 return d; 790 return d;
791 } 791 }
792} /* eet_data_image_lossless_compressed_convert */ 792}
793 793
794static void * 794static void *
795eet_data_image_jpeg_convert(int *size, 795eet_data_image_jpeg_convert(int *size,
@@ -872,7 +872,7 @@ eet_data_image_jpeg_convert(int *size,
872 872
873 *size = sz; 873 *size = sz;
874 return d; 874 return d;
875} /* eet_data_image_jpeg_convert */ 875}
876 876
877static void * 877static void *
878eet_data_image_jpeg_alpha_convert(int *size, 878eet_data_image_jpeg_alpha_convert(int *size,
@@ -1063,7 +1063,7 @@ eet_data_image_jpeg_alpha_convert(int *size,
1063 free(d2); 1063 free(d2);
1064 *size = 12 + sz1 + sz2; 1064 *size = 12 + sz1 + sz2;
1065 return d; 1065 return d;
1066} /* eet_data_image_jpeg_alpha_convert */ 1066}
1067 1067
1068EAPI int 1068EAPI int
1069eet_data_image_write_cipher(Eet_File *ef, 1069eet_data_image_write_cipher(Eet_File *ef,
@@ -1091,7 +1091,7 @@ eet_data_image_write_cipher(Eet_File *ef,
1091 } 1091 }
1092 1092
1093 return 0; 1093 return 0;
1094} /* eet_data_image_write_cipher */ 1094}
1095 1095
1096EAPI int 1096EAPI int
1097eet_data_image_write(Eet_File *ef, 1097eet_data_image_write(Eet_File *ef,
@@ -1114,7 +1114,7 @@ eet_data_image_write(Eet_File *ef,
1114 comp, 1114 comp,
1115 quality, 1115 quality,
1116 lossy); 1116 lossy);
1117} /* eet_data_image_write */ 1117}
1118 1118
1119EAPI void * 1119EAPI void *
1120eet_data_image_read_cipher(Eet_File *ef, 1120eet_data_image_read_cipher(Eet_File *ef,
@@ -1149,7 +1149,7 @@ eet_data_image_read_cipher(Eet_File *ef,
1149 free(data); 1149 free(data);
1150 1150
1151 return d; 1151 return d;
1152} /* eet_data_image_read_cipher */ 1152}
1153 1153
1154EAPI void * 1154EAPI void *
1155eet_data_image_read(Eet_File *ef, 1155eet_data_image_read(Eet_File *ef,
@@ -1163,7 +1163,7 @@ eet_data_image_read(Eet_File *ef,
1163{ 1163{
1164 return eet_data_image_read_cipher(ef, name, NULL, w, h, alpha, 1164 return eet_data_image_read_cipher(ef, name, NULL, w, h, alpha,
1165 comp, quality, lossy); 1165 comp, quality, lossy);
1166} /* eet_data_image_read */ 1166}
1167 1167
1168EAPI int 1168EAPI int
1169eet_data_image_read_to_surface_cipher(Eet_File *ef, 1169eet_data_image_read_to_surface_cipher(Eet_File *ef,
@@ -1204,7 +1204,7 @@ eet_data_image_read_to_surface_cipher(Eet_File *ef,
1204 free(data); 1204 free(data);
1205 1205
1206 return res; 1206 return res;
1207} /* eet_data_image_read_to_surface_cipher */ 1207}
1208 1208
1209EAPI int 1209EAPI int
1210eet_data_image_read_to_surface(Eet_File *ef, 1210eet_data_image_read_to_surface(Eet_File *ef,
@@ -1225,7 +1225,7 @@ eet_data_image_read_to_surface(Eet_File *ef,
1225 w, h, row_stride, 1225 w, h, row_stride,
1226 alpha, comp, quality, 1226 alpha, comp, quality,
1227 lossy); 1227 lossy);
1228} /* eet_data_image_read_to_surface */ 1228}
1229 1229
1230EAPI int 1230EAPI int
1231eet_data_image_header_read_cipher(Eet_File *ef, 1231eet_data_image_header_read_cipher(Eet_File *ef,
@@ -1260,7 +1260,7 @@ eet_data_image_header_read_cipher(Eet_File *ef,
1260 free(data); 1260 free(data);
1261 1261
1262 return d; 1262 return d;
1263} /* eet_data_image_header_read_cipher */ 1263}
1264 1264
1265EAPI int 1265EAPI int
1266eet_data_image_header_read(Eet_File *ef, 1266eet_data_image_header_read(Eet_File *ef,
@@ -1275,7 +1275,7 @@ eet_data_image_header_read(Eet_File *ef,
1275 return eet_data_image_header_read_cipher(ef, name, NULL, 1275 return eet_data_image_header_read_cipher(ef, name, NULL,
1276 w, h, alpha, 1276 w, h, alpha,
1277 comp, quality, lossy); 1277 comp, quality, lossy);
1278} /* eet_data_image_header_read */ 1278}
1279 1279
1280EAPI void * 1280EAPI void *
1281eet_data_image_encode_cipher(const void *data, 1281eet_data_image_encode_cipher(const void *data,
@@ -1333,7 +1333,7 @@ eet_data_image_encode_cipher(const void *data,
1333 *size_ret = size; 1333 *size_ret = size;
1334 1334
1335 return d; 1335 return d;
1336} /* eet_data_image_encode_cipher */ 1336}
1337 1337
1338EAPI void * 1338EAPI void *
1339eet_data_image_encode(const void *data, 1339eet_data_image_encode(const void *data,
@@ -1347,7 +1347,7 @@ eet_data_image_encode(const void *data,
1347{ 1347{
1348 return eet_data_image_encode_cipher(data, NULL, w, h, alpha, 1348 return eet_data_image_encode_cipher(data, NULL, w, h, alpha,
1349 comp, quality, lossy, size_ret); 1349 comp, quality, lossy, size_ret);
1350} /* eet_data_image_encode */ 1350}
1351 1351
1352EAPI int 1352EAPI int
1353eet_data_image_header_decode_cipher(const void *data, 1353eet_data_image_header_decode_cipher(const void *data,
@@ -1499,7 +1499,7 @@ eet_data_image_header_decode_cipher(const void *data,
1499 } 1499 }
1500 1500
1501 return 0; 1501 return 0;
1502} /* eet_data_image_header_decode_cipher */ 1502}
1503 1503
1504EAPI int 1504EAPI int
1505eet_data_image_header_decode(const void *data, 1505eet_data_image_header_decode(const void *data,
@@ -1520,7 +1520,7 @@ eet_data_image_header_decode(const void *data,
1520 comp, 1520 comp,
1521 quality, 1521 quality,
1522 lossy); 1522 lossy);
1523} /* eet_data_image_header_decode */ 1523}
1524 1524
1525static void 1525static void
1526_eet_data_image_copy_buffer(const unsigned int *src, 1526_eet_data_image_copy_buffer(const unsigned int *src,
@@ -1544,7 +1544,7 @@ _eet_data_image_copy_buffer(const unsigned int *src,
1544 for (y = 0; y < h; ++y, src += src_w, over += row_stride) 1544 for (y = 0; y < h; ++y, src += src_w, over += row_stride)
1545 memcpy(over, src, w * 4); 1545 memcpy(over, src, w * 4);
1546 } 1546 }
1547} /* _eet_data_image_copy_buffer */ 1547}
1548 1548
1549static int 1549static int
1550_eet_data_image_decode_inside(const void *data, 1550_eet_data_image_decode_inside(const void *data,
@@ -1647,7 +1647,7 @@ _eet_data_image_decode_inside(const void *data,
1647 abort(); 1647 abort();
1648 1648
1649 return 1; 1649 return 1;
1650} /* _eet_data_image_decode_inside */ 1650}
1651 1651
1652EAPI void * 1652EAPI void *
1653eet_data_image_decode_cipher(const void *data, 1653eet_data_image_decode_cipher(const void *data,
@@ -1714,7 +1714,7 @@ eet_data_image_decode_cipher(const void *data,
1714 *lossy = ilossy; 1714 *lossy = ilossy;
1715 1715
1716 return d; 1716 return d;
1717} /* eet_data_image_decode_cipher */ 1717}
1718 1718
1719EAPI void * 1719EAPI void *
1720eet_data_image_decode(const void *data, 1720eet_data_image_decode(const void *data,
@@ -1728,7 +1728,7 @@ eet_data_image_decode(const void *data,
1728{ 1728{
1729 return eet_data_image_decode_cipher(data, NULL, size, w, h, 1729 return eet_data_image_decode_cipher(data, NULL, size, w, h,
1730 alpha, comp, quality, lossy); 1730 alpha, comp, quality, lossy);
1731} /* eet_data_image_decode */ 1731}
1732 1732
1733EAPI int 1733EAPI int
1734eet_data_image_decode_to_surface_cipher(const void *data, 1734eet_data_image_decode_to_surface_cipher(const void *data,
@@ -1795,7 +1795,7 @@ eet_data_image_decode_to_surface_cipher(const void *data,
1795 *lossy = ilossy; 1795 *lossy = ilossy;
1796 1796
1797 return 1; 1797 return 1;
1798} /* eet_data_image_decode_to_surface_cipher */ 1798}
1799 1799
1800EAPI int 1800EAPI int
1801eet_data_image_decode_to_surface(const void *data, 1801eet_data_image_decode_to_surface(const void *data,
@@ -1816,5 +1816,5 @@ eet_data_image_decode_to_surface(const void *data,
1816 w, h, row_stride, 1816 w, h, row_stride,
1817 alpha, comp, quality, 1817 alpha, comp, quality,
1818 lossy); 1818 lossy);
1819} /* eet_data_image_decode_to_surface */ 1819}
1820 1820
diff --git a/libraries/eet/src/lib/eet_lib.c b/libraries/eet/src/lib/eet_lib.c
index a0d6435..04feebe 100644
--- a/libraries/eet/src/lib/eet_lib.c
+++ b/libraries/eet/src/lib/eet_lib.c
@@ -82,126 +82,6 @@ EAPI Eet_Version *eet_version = &_version;
82 82
83#define EET_MAGIC_FILE2 0x1ee70f42 83#define EET_MAGIC_FILE2 0x1ee70f42
84 84
85typedef struct _Eet_File_Header Eet_File_Header;
86typedef struct _Eet_File_Node Eet_File_Node;
87typedef struct _Eet_File_Directory Eet_File_Directory;
88
89struct _Eet_File
90{
91 char *path;
92 Eina_File *readfp;
93 Eet_File_Header *header;
94 Eet_Dictionary *ed;
95 Eet_Key *key;
96 const unsigned char *data;
97 const void *x509_der;
98 const void *signature;
99 void *sha1;
100
101 Eet_File_Mode mode;
102
103 int magic;
104 int references;
105
106 unsigned long int data_size;
107 int x509_length;
108 unsigned int signature_length;
109 int sha1_length;
110
111 Eina_Lock file_lock;
112
113 unsigned char writes_pending : 1;
114 unsigned char delete_me_now : 1;
115};
116
117struct _Eet_File_Header
118{
119 int magic;
120 Eet_File_Directory *directory;
121};
122
123struct _Eet_File_Directory
124{
125 int size;
126 Eet_File_Node **nodes;
127};
128
129struct _Eet_File_Node
130{
131 char *name;
132 void *data;
133 Eet_File_Node *next; /* FIXME: make buckets linked lists */
134
135 unsigned long int offset;
136 unsigned long int dictionary_offset;
137 unsigned long int name_offset;
138
139 unsigned int name_size;
140 unsigned int size;
141 unsigned int data_size;
142
143 unsigned char free_name : 1;
144 unsigned char compression : 1;
145 unsigned char ciphered : 1;
146 unsigned char alias : 1;
147};
148
149#if 0
150/* Version 2 */
151/* NB: all int's are stored in network byte order on disk */
152/* file format: */
153int magic; /* magic number ie 0x1ee7ff00 */
154int num_directory_entries; /* number of directory entries to follow */
155int bytes_directory_entries; /* bytes of directory entries to follow */
156struct
157{
158 int offset; /* bytes offset into file for data chunk */
159 int flags; /* flags - for now 0 = uncompressed and clear, 1 = compressed and clear, 2 = uncompressed and ciphered, 3 = compressed and ciphered */
160 int size; /* size of the data chunk */
161 int data_size; /* size of the (uncompressed) data chunk */
162 int name_size; /* length in bytes of the name field */
163 char name[name_size]; /* name string (variable length) and \0 terminated */
164} directory[num_directory_entries];
165/* and now startes the data stream... */
166#endif /* if 0 */
167
168#if 0
169/* Version 3 */
170/* NB: all int's are stored in network byte order on disk */
171/* file format: */
172int magic; /* magic number ie 0x1ee70f42 */
173int num_directory_entries; /* number of directory entries to follow */
174int num_dictionary_entries; /* number of dictionary entries to follow */
175struct
176{
177 int data_offset; /* bytes offset into file for data chunk */
178 int size; /* size of the data chunk */
179 int data_size; /* size of the (uncompressed) data chunk */
180 int name_offset; /* bytes offset into file for name string */
181 int name_size; /* length in bytes of the name field */
182 int flags; /* bit flags - for now:
183 bit 0 => compresion on/off
184 bit 1 => ciphered on/off
185 bit 2 => alias
186 */
187} directory[num_directory_entries];
188struct
189{
190 int hash;
191 int offset;
192 int size;
193 int prev;
194 int next;
195} dictionary[num_dictionary_entries];
196/* now start the string stream. */
197/* and right after them the data stream. */
198int magic_sign; /* Optional, only if the eet file is signed. */
199int signature_length; /* Signature length. */
200int x509_length; /* Public certificate that signed the file. */
201char signature[signature_length]; /* The signature. */
202char x509[x509_length]; /* The public certificate. */
203#endif /* if 0 */
204
205#define EET_FILE2_HEADER_COUNT 3 85#define EET_FILE2_HEADER_COUNT 3
206#define EET_FILE2_DIRECTORY_ENTRY_COUNT 6 86#define EET_FILE2_DIRECTORY_ENTRY_COUNT 6
207#define EET_FILE2_DICTIONARY_ENTRY_COUNT 5 87#define EET_FILE2_DICTIONARY_ENTRY_COUNT 5
@@ -280,7 +160,7 @@ eet_check_pointer(const Eet_File *ef)
280 return 1; 160 return 1;
281 161
282 return 0; 162 return 0;
283} /* eet_check_pointer */ 163}
284 164
285static inline int 165static inline int
286eet_check_header(const Eet_File *ef) 166eet_check_header(const Eet_File *ef)
@@ -292,7 +172,7 @@ eet_check_header(const Eet_File *ef)
292 return 1; 172 return 1;
293 173
294 return 0; 174 return 0;
295} /* eet_check_header */ 175}
296 176
297static inline int 177static inline int
298eet_test_close(int test, 178eet_test_close(int test,
@@ -305,7 +185,7 @@ eet_test_close(int test,
305 } 185 }
306 186
307 return test; 187 return test;
308} /* eet_test_close */ 188}
309 189
310/* find an eet file in the currently in use cache */ 190/* find an eet file in the currently in use cache */
311static Eet_File * 191static Eet_File *
@@ -326,7 +206,7 @@ eet_cache_find(const char *path,
326 206
327 /* not found */ 207 /* not found */
328 return NULL; 208 return NULL;
329} /* eet_cache_find */ 209}
330 210
331/* add to end of cache */ 211/* add to end of cache */
332/* this should only be called when the cache lock is already held */ 212/* this should only be called when the cache lock is already held */
@@ -382,7 +262,7 @@ eet_cache_add(Eet_File *ef,
382 *cache = new_cache; 262 *cache = new_cache;
383 *cache_num = new_cache_num; 263 *cache_num = new_cache_num;
384 *cache_alloc = new_cache_alloc; 264 *cache_alloc = new_cache_alloc;
385} /* eet_cache_add */ 265}
386 266
387/* delete from cache */ 267/* delete from cache */
388/* this should only be called when the cache lock is already held */ 268/* this should only be called when the cache lock is already held */
@@ -437,7 +317,7 @@ eet_cache_del(Eet_File *ef,
437 *cache = new_cache; 317 *cache = new_cache;
438 *cache_num = new_cache_num; 318 *cache_num = new_cache_num;
439 *cache_alloc = new_cache_alloc; 319 *cache_alloc = new_cache_alloc;
440} /* eet_cache_del */ 320}
441 321
442/* internal string match. null friendly, catches same ptr */ 322/* internal string match. null friendly, catches same ptr */
443static int 323static int
@@ -452,7 +332,7 @@ eet_string_match(const char *s1,
452 return 1; 332 return 1;
453 333
454 return !strcmp(s1, s2); 334 return !strcmp(s1, s2);
455} /* eet_string_match */ 335}
456 336
457/* flush out writes to a v2 eet file */ 337/* flush out writes to a v2 eet file */
458static Eet_Error 338static Eet_Error
@@ -494,7 +374,7 @@ eet_flush2(Eet_File *ef)
494 if (!fp) 374 if (!fp)
495 return EET_ERROR_NOT_WRITABLE; 375 return EET_ERROR_NOT_WRITABLE;
496 376
497 fcntl(fileno(fp), F_SETFD, FD_CLOEXEC); 377 fcntl(fd, F_SETFD, FD_CLOEXEC);
498 } 378 }
499 else 379 else
500 return EET_ERROR_NOT_WRITABLE; 380 return EET_ERROR_NOT_WRITABLE;
@@ -627,14 +507,6 @@ eet_flush2(Eet_File *ef)
627 507
628 /* flush all write to the file. */ 508 /* flush all write to the file. */
629 fflush(fp); 509 fflush(fp);
630// this is going to really cause trouble. if ANYTHING this needs to go into a
631// thread spawned off - but even then...
632// in this case... ext4 is "wrong". (yes we can jump up and down and point posix
633// manual pages at eachother, but ext4 broke behavior that has been in place
634// for decades and that 1000's of apps rely on daily - that is that one operation
635// to disk is committed to disk BEFORE following operations, so the fs retains
636// a consistent state
637// fsync(fileno(fp));
638 510
639 /* append signature if required */ 511 /* append signature if required */
640 if (ef->key) 512 if (ef->key)
@@ -665,13 +537,13 @@ write_error:
665 case EPIPE: error = EET_ERROR_WRITE_ERROR_FILE_CLOSED; break; 537 case EPIPE: error = EET_ERROR_WRITE_ERROR_FILE_CLOSED; break;
666 538
667 default: error = EET_ERROR_WRITE_ERROR; break; 539 default: error = EET_ERROR_WRITE_ERROR; break;
668 } /* switch */ 540 }
669 } 541 }
670 542
671sign_error: 543sign_error:
672 fclose(fp); 544 fclose(fp);
673 return error; 545 return error;
674} /* eet_flush2 */ 546}
675 547
676EAPI int 548EAPI int
677eet_init(void) 549eet_init(void)
@@ -680,10 +552,7 @@ eet_init(void)
680 return eet_init_count; 552 return eet_init_count;
681 553
682 if (!eina_init()) 554 if (!eina_init())
683 { 555 return --eet_init_count;
684 fprintf(stderr, "Eet: Eina init failed");
685 return --eet_init_count;
686 }
687 556
688 _eet_log_dom_global = eina_log_domain_register("eet", EET_DEFAULT_LOG_COLOR); 557 _eet_log_dom_global = eina_log_domain_register("eet", EET_DEFAULT_LOG_COLOR);
689 if (_eet_log_dom_global < 0) 558 if (_eet_log_dom_global < 0)
@@ -694,12 +563,18 @@ eet_init(void)
694 563
695 eina_lock_new(&eet_cache_lock); 564 eina_lock_new(&eet_cache_lock);
696 565
697 if (!eet_node_init()) 566 if (!eet_mempool_init())
698 { 567 {
699 EINA_LOG_ERR("Eet: Eet_Node mempool creation failed"); 568 EINA_LOG_ERR("Eet: Eet_Node mempool creation failed");
700 goto unregister_log_domain; 569 goto unregister_log_domain;
701 } 570 }
702 571
572 if (!eet_node_init())
573 {
574 EINA_LOG_ERR("Eet: Eet_Node mempool creation failed");
575 goto shutdown_mempool;
576 }
577
703#ifdef HAVE_GNUTLS 578#ifdef HAVE_GNUTLS
704 /* Before the library can be used, it must initialize itself if needed. */ 579 /* Before the library can be used, it must initialize itself if needed. */
705 if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0) 580 if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0)
@@ -741,13 +616,15 @@ eet_init(void)
741shutdown_eet: 616shutdown_eet:
742#endif 617#endif
743 eet_node_shutdown(); 618 eet_node_shutdown();
619shutdown_mempool:
620 eet_mempool_shutdown();
744unregister_log_domain: 621unregister_log_domain:
745 eina_log_domain_unregister(_eet_log_dom_global); 622 eina_log_domain_unregister(_eet_log_dom_global);
746 _eet_log_dom_global = -1; 623 _eet_log_dom_global = -1;
747shutdown_eina: 624shutdown_eina:
748 eina_shutdown(); 625 eina_shutdown();
749 return --eet_init_count; 626 return --eet_init_count;
750} /* eet_init */ 627}
751 628
752EAPI int 629EAPI int
753eet_shutdown(void) 630eet_shutdown(void)
@@ -757,6 +634,7 @@ eet_shutdown(void)
757 634
758 eet_clearcache(); 635 eet_clearcache();
759 eet_node_shutdown(); 636 eet_node_shutdown();
637 eet_mempool_shutdown();
760 638
761 eina_lock_free(&eet_cache_lock); 639 eina_lock_free(&eet_cache_lock);
762 640
@@ -772,7 +650,7 @@ eet_shutdown(void)
772 eina_shutdown(); 650 eina_shutdown();
773 651
774 return eet_init_count; 652 return eet_init_count;
775} /* eet_shutdown */ 653}
776 654
777EAPI Eet_Error 655EAPI Eet_Error
778eet_sync(Eet_File *ef) 656eet_sync(Eet_File *ef)
@@ -795,7 +673,7 @@ eet_sync(Eet_File *ef)
795 673
796 UNLOCK_FILE(ef); 674 UNLOCK_FILE(ef);
797 return ret; 675 return ret;
798} /* eet_sync */ 676}
799 677
800EAPI void 678EAPI void
801eet_clearcache(void) 679eet_clearcache(void)
@@ -853,7 +731,7 @@ eet_clearcache(void)
853 } 731 }
854 732
855 UNLOCK_CACHE; 733 UNLOCK_CACHE;
856} /* eet_clearcache */ 734}
857 735
858/* FIXME: MMAP race condition in READ_WRITE_MODE */ 736/* FIXME: MMAP race condition in READ_WRITE_MODE */
859static Eet_File * 737static Eet_File *
@@ -902,14 +780,14 @@ eet_internal_read2(Eet_File *ef)
902 return NULL; 780 return NULL;
903 781
904 /* allocate header */ 782 /* allocate header */
905 ef->header = calloc(1, sizeof(Eet_File_Header)); 783 ef->header = eet_file_header_calloc(1);
906 if (eet_test_close(!ef->header, ef)) 784 if (eet_test_close(!ef->header, ef))
907 return NULL; 785 return NULL;
908 786
909 ef->header->magic = EET_MAGIC_FILE_HEADER; 787 ef->header->magic = EET_MAGIC_FILE_HEADER;
910 788
911 /* allocate directory block in ram */ 789 /* allocate directory block in ram */
912 ef->header->directory = calloc(1, sizeof(Eet_File_Directory)); 790 ef->header->directory = eet_file_directory_calloc(1);
913 if (eet_test_close(!ef->header->directory, ef)) 791 if (eet_test_close(!ef->header->directory, ef))
914 return NULL; 792 return NULL;
915 793
@@ -939,10 +817,10 @@ eet_internal_read2(Eet_File *ef)
939 817
940 /* out directory block is inconsistent - we have overrun our */ 818 /* out directory block is inconsistent - we have overrun our */
941 /* dynamic block buffer before we finished scanning dir entries */ 819 /* dynamic block buffer before we finished scanning dir entries */
942 efn = malloc(sizeof(Eet_File_Node)); 820 efn = eet_file_node_malloc(1);
943 if (eet_test_close(!efn, ef)) 821 if (eet_test_close(!efn, ef))
944 { 822 {
945 if (efn) free(efn); /* yes i know - we only get here if 823 if (efn) eet_file_node_mp_free(efn); /* yes i know - we only get here if
946 * efn is null/0 -> trying to shut up 824 * efn is null/0 -> trying to shut up
947 * warning tools like cppcheck */ 825 * warning tools like cppcheck */
948 return NULL; 826 return NULL;
@@ -963,7 +841,7 @@ eet_internal_read2(Eet_File *ef)
963#define EFN_TEST(Test, Ef, Efn) \ 841#define EFN_TEST(Test, Ef, Efn) \
964 if (eet_test_close(Test, Ef)) \ 842 if (eet_test_close(Test, Ef)) \
965 { \ 843 { \
966 free(Efn); \ 844 eet_file_node_mp_free(Efn); \
967 return NULL; \ 845 return NULL; \
968 } 846 }
969 847
@@ -1022,11 +900,11 @@ eet_internal_read2(Eet_File *ef)
1022 ef)) 900 ef))
1023 return NULL; 901 return NULL;
1024 902
1025 ef->ed = calloc(1, sizeof (Eet_Dictionary)); 903 ef->ed = eet_dictionary_calloc(1);
1026 if (eet_test_close(!ef->ed, ef)) 904 if (eet_test_close(!ef->ed, ef))
1027 return NULL; 905 return NULL;
1028 906
1029 ef->ed->all = calloc(num_dictionary_entries, sizeof (Eet_String)); 907 ef->ed->all = calloc(1, num_dictionary_entries * sizeof(Eet_String));
1030 if (eet_test_close(!ef->ed->all, ef)) 908 if (eet_test_close(!ef->ed->all, ef))
1031 return NULL; 909 return NULL;
1032 910
@@ -1112,7 +990,7 @@ eet_internal_read2(Eet_File *ef)
1112 } 990 }
1113 991
1114 return ef; 992 return ef;
1115} /* eet_internal_read2 */ 993}
1116 994
1117#if EET_OLD_EET_FILE_FORMAT 995#if EET_OLD_EET_FILE_FORMAT
1118static Eet_File * 996static Eet_File *
@@ -1162,14 +1040,14 @@ eet_internal_read1(Eet_File *ef)
1162 return NULL; 1040 return NULL;
1163 1041
1164 /* allocate header */ 1042 /* allocate header */
1165 ef->header = calloc(1, sizeof(Eet_File_Header)); 1043 ef->header = eet_file_header_calloc(1);
1166 if (eet_test_close(!ef->header, ef)) 1044 if (eet_test_close(!ef->header, ef))
1167 return NULL; 1045 return NULL;
1168 1046
1169 ef->header->magic = EET_MAGIC_FILE_HEADER; 1047 ef->header->magic = EET_MAGIC_FILE_HEADER;
1170 1048
1171 /* allocate directory block in ram */ 1049 /* allocate directory block in ram */
1172 ef->header->directory = calloc(1, sizeof(Eet_File_Directory)); 1050 ef->header->directory = eet_file_directory_calloc(1);
1173 if (eet_test_close(!ef->header->directory, ef)) 1051 if (eet_test_close(!ef->header->directory, ef))
1174 return NULL; 1052 return NULL;
1175 1053
@@ -1204,10 +1082,10 @@ eet_internal_read1(Eet_File *ef)
1204 return NULL; 1082 return NULL;
1205 1083
1206 /* allocate all the ram needed for this stored node accounting */ 1084 /* allocate all the ram needed for this stored node accounting */
1207 efn = malloc (sizeof(Eet_File_Node)); 1085 efn = eet_file_node_malloc(1);
1208 if (eet_test_close(!efn, ef)) 1086 if (eet_test_close(!efn, ef))
1209 { 1087 {
1210 if (efn) free(efn); /* yes i know - we only get here if 1088 if (efn) eet_file_node_mp_free(efn); /* yes i know - we only get here if
1211 * efn is null/0 -> trying to shut up 1089 * efn is null/0 -> trying to shut up
1212 * warning tools like cppcheck */ 1090 * warning tools like cppcheck */
1213 return NULL; 1091 return NULL;
@@ -1227,21 +1105,21 @@ eet_internal_read1(Eet_File *ef)
1227 /* invalid size */ 1105 /* invalid size */
1228 if (eet_test_close(efn->size <= 0, ef)) 1106 if (eet_test_close(efn->size <= 0, ef))
1229 { 1107 {
1230 free(efn); 1108 eet_file_node_mp_free(efn);
1231 return NULL; 1109 return NULL;
1232 } 1110 }
1233 1111
1234 /* invalid name_size */ 1112 /* invalid name_size */
1235 if (eet_test_close(name_size <= 0, ef)) 1113 if (eet_test_close(name_size <= 0, ef))
1236 { 1114 {
1237 free(efn); 1115 eet_file_node_mp_free(efn);
1238 return NULL; 1116 return NULL;
1239 } 1117 }
1240 1118
1241 /* reading name would mean falling off end of dyn_buf - invalid */ 1119 /* reading name would mean falling off end of dyn_buf - invalid */
1242 if (eet_test_close((p + 16 + name_size) > (dyn_buf + byte_entries), ef)) 1120 if (eet_test_close((p + 16 + name_size) > (dyn_buf + byte_entries), ef))
1243 { 1121 {
1244 free(efn); 1122 eet_file_node_mp_free(efn);
1245 return NULL; 1123 return NULL;
1246 } 1124 }
1247 1125
@@ -1257,7 +1135,7 @@ eet_internal_read1(Eet_File *ef)
1257 efn->name = malloc(sizeof(char) * name_size + 1); 1135 efn->name = malloc(sizeof(char) * name_size + 1);
1258 if (eet_test_close(!efn->name, ef)) 1136 if (eet_test_close(!efn->name, ef))
1259 { 1137 {
1260 free(efn); 1138 eet_file_node_mp_free(efn);
1261 return NULL; 1139 return NULL;
1262 } 1140 }
1263 1141
@@ -1294,7 +1172,7 @@ eet_internal_read1(Eet_File *ef)
1294 p += HEADER_SIZE + name_size; 1172 p += HEADER_SIZE + name_size;
1295 } 1173 }
1296 return ef; 1174 return ef;
1297} /* eet_internal_read1 */ 1175}
1298 1176
1299#endif /* if EET_OLD_EET_FILE_FORMAT */ 1177#endif /* if EET_OLD_EET_FILE_FORMAT */
1300 1178
@@ -1329,10 +1207,10 @@ eet_internal_read(Eet_File *ef)
1329 ef->delete_me_now = 1; 1207 ef->delete_me_now = 1;
1330 eet_internal_close(ef, EINA_TRUE); 1208 eet_internal_close(ef, EINA_TRUE);
1331 break; 1209 break;
1332 } /* switch */ 1210 }
1333 1211
1334 return NULL; 1212 return NULL;
1335} /* eet_internal_read */ 1213}
1336 1214
1337static Eet_Error 1215static Eet_Error
1338eet_internal_close(Eet_File *ef, 1216eet_internal_close(Eet_File *ef,
@@ -1405,16 +1283,16 @@ eet_internal_close(Eet_File *ef,
1405 if (efn->free_name) 1283 if (efn->free_name)
1406 free(efn->name); 1284 free(efn->name);
1407 1285
1408 free(efn); 1286 eet_file_node_mp_free(efn);
1409 } 1287 }
1410 } 1288 }
1411 free(ef->header->directory->nodes); 1289 free(ef->header->directory->nodes);
1412 } 1290 }
1413 1291
1414 free(ef->header->directory); 1292 eet_file_directory_mp_free(ef->header->directory);
1415 } 1293 }
1416 1294
1417 free(ef->header); 1295 eet_file_header_mp_free(ef->header);
1418 } 1296 }
1419 1297
1420 eet_dictionary_free(ef->ed); 1298 eet_dictionary_free(ef->ed);
@@ -1434,7 +1312,8 @@ eet_internal_close(Eet_File *ef,
1434 memset(ef, 0, sizeof(Eet_File)); 1312 memset(ef, 0, sizeof(Eet_File));
1435 1313
1436 /* free it */ 1314 /* free it */
1437 free(ef); 1315 eina_stringshare_del(ef->path);
1316 eet_file_mp_free(ef);
1438 return err; 1317 return err;
1439 1318
1440on_error: 1319on_error:
@@ -1442,7 +1321,7 @@ on_error:
1442 UNLOCK_CACHE; 1321 UNLOCK_CACHE;
1443 1322
1444 return EET_ERROR_NONE; 1323 return EET_ERROR_NONE;
1445} /* eet_internal_close */ 1324}
1446 1325
1447EAPI Eet_File * 1326EAPI Eet_File *
1448eet_memopen_read(const void *data, 1327eet_memopen_read(const void *data,
@@ -1453,7 +1332,7 @@ eet_memopen_read(const void *data,
1453 if (!data || size == 0) 1332 if (!data || size == 0)
1454 return NULL; 1333 return NULL;
1455 1334
1456 ef = malloc (sizeof (Eet_File)); 1335 ef = eet_file_malloc(1);
1457 if (!ef) 1336 if (!ef)
1458 return NULL; 1337 return NULL;
1459 1338
@@ -1477,7 +1356,14 @@ eet_memopen_read(const void *data,
1477 ef = eet_internal_read(ef); 1356 ef = eet_internal_read(ef);
1478 UNLOCK_CACHE; 1357 UNLOCK_CACHE;
1479 return ef; 1358 return ef;
1480} /* eet_memopen_read */ 1359}
1360
1361EAPI const char *
1362eet_file_get(Eet_File *ef)
1363{
1364 if (eet_check_pointer(ef)) return NULL;
1365 return ef->path;
1366}
1481 1367
1482EAPI Eet_File * 1368EAPI Eet_File *
1483eet_open(const char *file, 1369eet_open(const char *file,
@@ -1578,7 +1464,7 @@ open_error:
1578 file_len = strlen(file) + 1; 1464 file_len = strlen(file) + 1;
1579 1465
1580 /* Allocate struct for eet file and have it zero'd out */ 1466 /* Allocate struct for eet file and have it zero'd out */
1581 ef = malloc(sizeof(Eet_File) + file_len); 1467 ef = eet_file_malloc(1);
1582 if (!ef) 1468 if (!ef)
1583 goto on_error; 1469 goto on_error;
1584 1470
@@ -1586,8 +1472,7 @@ open_error:
1586 INIT_FILE(ef); 1472 INIT_FILE(ef);
1587 ef->key = NULL; 1473 ef->key = NULL;
1588 ef->readfp = fp; 1474 ef->readfp = fp;
1589 ef->path = ((char *)ef) + sizeof(Eet_File); 1475 ef->path = eina_stringshare_add_length(file, file_len);
1590 memcpy(ef->path, file, file_len);
1591 ef->magic = EET_MAGIC_FILE; 1476 ef->magic = EET_MAGIC_FILE;
1592 ef->references = 1; 1477 ef->references = 1;
1593 ef->mode = mode; 1478 ef->mode = mode;
@@ -1641,7 +1526,7 @@ empty_file:
1641on_error: 1526on_error:
1642 UNLOCK_CACHE; 1527 UNLOCK_CACHE;
1643 return NULL; 1528 return NULL;
1644} /* eet_open */ 1529}
1645 1530
1646EAPI Eet_File_Mode 1531EAPI Eet_File_Mode
1647eet_mode_get(Eet_File *ef) 1532eet_mode_get(Eet_File *ef)
@@ -1651,7 +1536,7 @@ eet_mode_get(Eet_File *ef)
1651 return EET_FILE_MODE_INVALID; 1536 return EET_FILE_MODE_INVALID;
1652 else 1537 else
1653 return ef->mode; 1538 return ef->mode;
1654} /* eet_mode_get */ 1539}
1655 1540
1656EAPI const void * 1541EAPI const void *
1657eet_identity_x509(Eet_File *ef, 1542eet_identity_x509(Eet_File *ef,
@@ -1664,7 +1549,7 @@ eet_identity_x509(Eet_File *ef,
1664 *der_length = ef->x509_length; 1549 *der_length = ef->x509_length;
1665 1550
1666 return ef->x509_der; 1551 return ef->x509_der;
1667} /* eet_identity_x509 */ 1552}
1668 1553
1669EAPI const void * 1554EAPI const void *
1670eet_identity_signature(Eet_File *ef, 1555eet_identity_signature(Eet_File *ef,
@@ -1677,7 +1562,7 @@ eet_identity_signature(Eet_File *ef,
1677 *signature_length = ef->signature_length; 1562 *signature_length = ef->signature_length;
1678 1563
1679 return ef->signature; 1564 return ef->signature;
1680} /* eet_identity_signature */ 1565}
1681 1566
1682EAPI const void * 1567EAPI const void *
1683eet_identity_sha1(Eet_File *ef, 1568eet_identity_sha1(Eet_File *ef,
@@ -1692,7 +1577,7 @@ eet_identity_sha1(Eet_File *ef,
1692 *sha1_length = ef->sha1_length; 1577 *sha1_length = ef->sha1_length;
1693 1578
1694 return ef->sha1; 1579 return ef->sha1;
1695} /* eet_identity_sha1 */ 1580}
1696 1581
1697EAPI Eet_Error 1582EAPI Eet_Error
1698eet_identity_set(Eet_File *ef, 1583eet_identity_set(Eet_File *ef,
@@ -1712,13 +1597,13 @@ eet_identity_set(Eet_File *ef,
1712 ef->writes_pending = 1; 1597 ef->writes_pending = 1;
1713 1598
1714 return EET_ERROR_NONE; 1599 return EET_ERROR_NONE;
1715} /* eet_identity_set */ 1600}
1716 1601
1717EAPI Eet_Error 1602EAPI Eet_Error
1718eet_close(Eet_File *ef) 1603eet_close(Eet_File *ef)
1719{ 1604{
1720 return eet_internal_close(ef, EINA_FALSE); 1605 return eet_internal_close(ef, EINA_FALSE);
1721} /* eet_close */ 1606}
1722 1607
1723EAPI void * 1608EAPI void *
1724eet_read_cipher(Eet_File *ef, 1609eet_read_cipher(Eet_File *ef,
@@ -1889,7 +1774,7 @@ on_error:
1889 UNLOCK_FILE(ef); 1774 UNLOCK_FILE(ef);
1890 free(data); 1775 free(data);
1891 return NULL; 1776 return NULL;
1892} /* eet_read_cipher */ 1777}
1893 1778
1894EAPI void * 1779EAPI void *
1895eet_read(Eet_File *ef, 1780eet_read(Eet_File *ef,
@@ -1897,7 +1782,7 @@ eet_read(Eet_File *ef,
1897 int *size_ret) 1782 int *size_ret)
1898{ 1783{
1899 return eet_read_cipher(ef, name, size_ret, NULL); 1784 return eet_read_cipher(ef, name, size_ret, NULL);
1900} /* eet_read */ 1785}
1901 1786
1902EAPI const void * 1787EAPI const void *
1903eet_read_direct(Eet_File *ef, 1788eet_read_direct(Eet_File *ef,
@@ -1995,7 +1880,7 @@ eet_read_direct(Eet_File *ef,
1995on_error: 1880on_error:
1996 UNLOCK_FILE(ef); 1881 UNLOCK_FILE(ef);
1997 return NULL; 1882 return NULL;
1998} /* eet_read_direct */ 1883}
1999 1884
2000EAPI const char * 1885EAPI const char *
2001eet_alias_get(Eet_File *ef, 1886eet_alias_get(Eet_File *ef,
@@ -2102,16 +1987,16 @@ eet_alias(Eet_File *ef,
2102 if (!ef->header) 1987 if (!ef->header)
2103 { 1988 {
2104 /* allocate header */ 1989 /* allocate header */
2105 ef->header = calloc(1, sizeof(Eet_File_Header)); 1990 ef->header = eet_file_header_calloc(1);
2106 if (!ef->header) 1991 if (!ef->header)
2107 goto on_error; 1992 goto on_error;
2108 1993
2109 ef->header->magic = EET_MAGIC_FILE_HEADER; 1994 ef->header->magic = EET_MAGIC_FILE_HEADER;
2110 /* allocate directory block in ram */ 1995 /* allocate directory block in ram */
2111 ef->header->directory = calloc(1, sizeof(Eet_File_Directory)); 1996 ef->header->directory = eet_file_directory_calloc(1);
2112 if (!ef->header->directory) 1997 if (!ef->header->directory)
2113 { 1998 {
2114 free(ef->header); 1999 eet_file_header_mp_free(ef->header);
2115 ef->header = NULL; 2000 ef->header = NULL;
2116 goto on_error; 2001 goto on_error;
2117 } 2002 }
@@ -2124,7 +2009,7 @@ eet_alias(Eet_File *ef,
2124 (1 << ef->header->directory->size)); 2009 (1 << ef->header->directory->size));
2125 if (!ef->header->directory->nodes) 2010 if (!ef->header->directory->nodes)
2126 { 2011 {
2127 free(ef->header->directory); 2012 eet_file_directory_mp_free(ef->header->directory);
2128 ef->header = NULL; 2013 ef->header = NULL;
2129 goto on_error; 2014 goto on_error;
2130 } 2015 }
@@ -2198,7 +2083,7 @@ eet_alias(Eet_File *ef,
2198 } 2083 }
2199 if (!exists_already) 2084 if (!exists_already)
2200 { 2085 {
2201 efn = malloc(sizeof(Eet_File_Node)); 2086 efn = eet_file_node_malloc(1);
2202 if (!efn) 2087 if (!efn)
2203 { 2088 {
2204 free(data2); 2089 free(data2);
@@ -2230,7 +2115,7 @@ eet_alias(Eet_File *ef,
2230on_error: 2115on_error:
2231 UNLOCK_FILE(ef); 2116 UNLOCK_FILE(ef);
2232 return EINA_FALSE; 2117 return EINA_FALSE;
2233} /* eet_alias */ 2118}
2234 2119
2235EAPI int 2120EAPI int
2236eet_write_cipher(Eet_File *ef, 2121eet_write_cipher(Eet_File *ef,
@@ -2262,16 +2147,16 @@ eet_write_cipher(Eet_File *ef,
2262 if (!ef->header) 2147 if (!ef->header)
2263 { 2148 {
2264 /* allocate header */ 2149 /* allocate header */
2265 ef->header = calloc(1, sizeof(Eet_File_Header)); 2150 ef->header = eet_file_header_calloc(1);
2266 if (!ef->header) 2151 if (!ef->header)
2267 goto on_error; 2152 goto on_error;
2268 2153
2269 ef->header->magic = EET_MAGIC_FILE_HEADER; 2154 ef->header->magic = EET_MAGIC_FILE_HEADER;
2270 /* allocate directory block in ram */ 2155 /* allocate directory block in ram */
2271 ef->header->directory = calloc(1, sizeof(Eet_File_Directory)); 2156 ef->header->directory = eet_file_directory_calloc(1);
2272 if (!ef->header->directory) 2157 if (!ef->header->directory)
2273 { 2158 {
2274 free(ef->header); 2159 eet_file_header_mp_free(ef->header);
2275 ef->header = NULL; 2160 ef->header = NULL;
2276 goto on_error; 2161 goto on_error;
2277 } 2162 }
@@ -2284,7 +2169,7 @@ eet_write_cipher(Eet_File *ef,
2284 (1 << ef->header->directory->size)); 2169 (1 << ef->header->directory->size));
2285 if (!ef->header->directory->nodes) 2170 if (!ef->header->directory->nodes)
2286 { 2171 {
2287 free(ef->header->directory); 2172 eet_file_directory_mp_free(ef->header->directory);
2288 ef->header = NULL; 2173 ef->header = NULL;
2289 goto on_error; 2174 goto on_error;
2290 } 2175 }
@@ -2382,7 +2267,7 @@ eet_write_cipher(Eet_File *ef,
2382 } 2267 }
2383 if (!exists_already) 2268 if (!exists_already)
2384 { 2269 {
2385 efn = malloc(sizeof(Eet_File_Node)); 2270 efn = eet_file_node_malloc(1);
2386 if (!efn) 2271 if (!efn)
2387 { 2272 {
2388 free(data2); 2273 free(data2);
@@ -2413,7 +2298,7 @@ eet_write_cipher(Eet_File *ef,
2413on_error: 2298on_error:
2414 UNLOCK_FILE(ef); 2299 UNLOCK_FILE(ef);
2415 return 0; 2300 return 0;
2416} /* eet_write_cipher */ 2301}
2417 2302
2418EAPI int 2303EAPI int
2419eet_write(Eet_File *ef, 2304eet_write(Eet_File *ef,
@@ -2423,7 +2308,7 @@ eet_write(Eet_File *ef,
2423 int comp) 2308 int comp)
2424{ 2309{
2425 return eet_write_cipher(ef, name, data, size, comp, NULL); 2310 return eet_write_cipher(ef, name, data, size, comp, NULL);
2426} /* eet_write */ 2311}
2427 2312
2428EAPI int 2313EAPI int
2429eet_delete(Eet_File *ef, 2314eet_delete(Eet_File *ef,
@@ -2472,7 +2357,7 @@ eet_delete(Eet_File *ef,
2472 if (efn->free_name) 2357 if (efn->free_name)
2473 free(efn->name); 2358 free(efn->name);
2474 2359
2475 free(efn); 2360 eet_file_node_mp_free(efn);
2476 exists_already = 1; 2361 exists_already = 1;
2477 break; 2362 break;
2478 } 2363 }
@@ -2485,7 +2370,7 @@ eet_delete(Eet_File *ef,
2485 2370
2486 /* update access time */ 2371 /* update access time */
2487 return exists_already; 2372 return exists_already;
2488} /* eet_delete */ 2373}
2489 2374
2490EAPI Eet_Dictionary * 2375EAPI Eet_Dictionary *
2491eet_dictionary_get(Eet_File *ef) 2376eet_dictionary_get(Eet_File *ef)
@@ -2494,7 +2379,7 @@ eet_dictionary_get(Eet_File *ef)
2494 return NULL; 2379 return NULL;
2495 2380
2496 return ef->ed; 2381 return ef->ed;
2497} /* eet_dictionary_get */ 2382}
2498 2383
2499EAPI char ** 2384EAPI char **
2500eet_list(Eet_File *ef, 2385eet_list(Eet_File *ef,
@@ -2578,7 +2463,7 @@ on_error:
2578 *count_ret = 0; 2463 *count_ret = 0;
2579 2464
2580 return NULL; 2465 return NULL;
2581} /* eet_list */ 2466}
2582 2467
2583EAPI int 2468EAPI int
2584eet_num_entries(Eet_File *ef) 2469eet_num_entries(Eet_File *ef)
@@ -2605,7 +2490,7 @@ eet_num_entries(Eet_File *ef)
2605 UNLOCK_FILE(ef); 2490 UNLOCK_FILE(ef);
2606 2491
2607 return ret; 2492 return ret;
2608} /* eet_num_entries */ 2493}
2609 2494
2610static Eet_File_Node * 2495static Eet_File_Node *
2611find_node_by_name(Eet_File *ef, 2496find_node_by_name(Eet_File *ef,
@@ -2624,7 +2509,7 @@ find_node_by_name(Eet_File *ef,
2624 } 2509 }
2625 2510
2626 return NULL; 2511 return NULL;
2627} /* find_node_by_name */ 2512}
2628 2513
2629static int 2514static int
2630read_data_from_disk(Eet_File *ef, 2515read_data_from_disk(Eet_File *ef,
@@ -2644,5 +2529,5 @@ read_data_from_disk(Eet_File *ef,
2644 memcpy(buf, ef->data + efn->offset, len); 2529 memcpy(buf, ef->data + efn->offset, len);
2645 2530
2646 return len; 2531 return len;
2647} /* read_data_from_disk */ 2532}
2648 2533
diff --git a/libraries/eet/src/lib/eet_node.c b/libraries/eet/src/lib/eet_node.c
index d90ef83..11d7cc0 100644
--- a/libraries/eet/src/lib/eet_node.c
+++ b/libraries/eet/src/lib/eet_node.c
@@ -27,13 +27,13 @@ eet_node_new(void)
27 27
28 memset(result, 0, sizeof (Eet_Node)); 28 memset(result, 0, sizeof (Eet_Node));
29 return result; 29 return result;
30} /* eet_node_new */ 30}
31 31
32void 32void
33eet_node_free(Eet_Node *node) 33eet_node_free(Eet_Node *node)
34{ 34{
35 eina_mempool_free(_eet_node_mp, node); 35 eina_mempool_free(_eet_node_mp, node);
36} /* eet_node_free */ 36}
37 37
38static Eet_Node * 38static Eet_Node *
39_eet_node_new(const char *name, 39_eet_node_new(const char *name,
@@ -49,7 +49,7 @@ _eet_node_new(const char *name,
49 n->name = eina_stringshare_add(name); 49 n->name = eina_stringshare_add(name);
50 50
51 return n; 51 return n;
52} /* _eet_node_new */ 52}
53 53
54static void 54static void
55_eet_node_append(Eet_Node *n, 55_eet_node_append(Eet_Node *n,
@@ -63,7 +63,7 @@ _eet_node_append(Eet_Node *n,
63 value->next = n->values; 63 value->next = n->values;
64 n->values = value; 64 n->values = value;
65 } 65 }
66} /* _eet_node_append */ 66}
67 67
68#define EET_NODE_NEW(Eet_type, Name, Value, Type) \ 68#define EET_NODE_NEW(Eet_type, Name, Value, Type) \
69 EAPI Eet_Node * \ 69 EAPI Eet_Node * \
@@ -133,7 +133,7 @@ eet_node_list_new(const char *name,
133 _eet_node_append(n, nodes); 133 _eet_node_append(n, nodes);
134 134
135 return n; 135 return n;
136} /* eet_node_list_new */ 136}
137 137
138Eet_Node * 138Eet_Node *
139eet_node_array_new(const char *name, 139eet_node_array_new(const char *name,
@@ -151,7 +151,7 @@ eet_node_array_new(const char *name,
151 _eet_node_append(n, nodes); 151 _eet_node_append(n, nodes);
152 152
153 return n; 153 return n;
154} /* eet_node_array_new */ 154}
155 155
156Eet_Node * 156Eet_Node *
157eet_node_var_array_new(const char *name, 157eet_node_var_array_new(const char *name,
@@ -168,7 +168,7 @@ eet_node_var_array_new(const char *name,
168 _eet_node_append(n, nodes); 168 _eet_node_append(n, nodes);
169 169
170 return n; 170 return n;
171} /* eet_node_var_array_new */ 171}
172 172
173Eet_Node * 173Eet_Node *
174eet_node_hash_new(const char *name, 174eet_node_hash_new(const char *name,
@@ -191,7 +191,7 @@ eet_node_hash_new(const char *name,
191 _eet_node_append(n, nodes); 191 _eet_node_append(n, nodes);
192 192
193 return n; 193 return n;
194} /* eet_node_hash_new */ 194}
195 195
196Eet_Node * 196Eet_Node *
197eet_node_struct_new(const char *name, 197eet_node_struct_new(const char *name,
@@ -206,7 +206,7 @@ eet_node_struct_new(const char *name,
206 _eet_node_append(n, nodes); 206 _eet_node_append(n, nodes);
207 207
208 return n; 208 return n;
209} /* eet_node_struct_new */ 209}
210 210
211Eet_Node * 211Eet_Node *
212eet_node_struct_child_new(const char *parent, 212eet_node_struct_child_new(const char *parent,
@@ -226,7 +226,7 @@ eet_node_struct_child_new(const char *parent,
226 _eet_node_append(n, eina_list_prepend(NULL, child)); 226 _eet_node_append(n, eina_list_prepend(NULL, child));
227 227
228 return n; 228 return n;
229} /* eet_node_struct_child_new */ 229}
230 230
231Eet_Node * 231Eet_Node *
232eet_node_children_get(Eet_Node *node) 232eet_node_children_get(Eet_Node *node)
@@ -289,7 +289,7 @@ eet_node_list_append(Eet_Node *parent,
289 parent->values = nn; 289 parent->values = nn;
290 290
291 eina_stringshare_del(tmp); 291 eina_stringshare_del(tmp);
292} /* eet_node_list_append */ 292}
293 293
294void 294void
295eet_node_struct_append(Eet_Node *parent, 295eet_node_struct_append(Eet_Node *parent,
@@ -338,7 +338,7 @@ eet_node_struct_append(Eet_Node *parent,
338 } 338 }
339 339
340 eina_stringshare_del(tmp); 340 eina_stringshare_del(tmp);
341} /* eet_node_struct_append */ 341}
342 342
343void 343void
344eet_node_hash_add(Eet_Node *parent, 344eet_node_hash_add(Eet_Node *parent,
@@ -356,7 +356,7 @@ eet_node_hash_add(Eet_Node *parent,
356 /* And add it to the parent. */ 356 /* And add it to the parent. */
357 nn->next = parent->values; 357 nn->next = parent->values;
358 parent->values = nn; 358 parent->values = nn;
359} /* eet_node_hash_add */ 359}
360 360
361int 361int
362eet_node_type_get(Eet_Node *node) 362eet_node_type_get(Eet_Node *node)
@@ -420,11 +420,11 @@ eet_node_del(Eet_Node *n)
420 case EET_T_USHORT: 420 case EET_T_USHORT:
421 case EET_T_UINT: 421 case EET_T_UINT:
422 break; 422 break;
423 } /* switch */ 423 }
424 424
425 eina_stringshare_del(n->name); 425 eina_stringshare_del(n->name);
426 eet_node_free(n); 426 eet_node_free(n);
427} /* eet_node_del */ 427}
428 428
429static const char *eet_node_dump_g_name[6] = { 429static const char *eet_node_dump_g_name[6] = {
430 "struct", 430 "struct",
@@ -458,7 +458,7 @@ eet_node_dump_level(int level,
458 int i; 458 int i;
459 459
460 for (i = 0; i < level; i++) dumpfunc(dumpdata, " "); 460 for (i = 0; i < level; i++) dumpfunc(dumpdata, " ");
461} /* eet_node_dump_level */ 461}
462 462
463static char * 463static char *
464eet_node_string_escape(const char *str) 464eet_node_string_escape(const char *str)
@@ -499,7 +499,7 @@ eet_node_string_escape(const char *str)
499 } 499 }
500 *sp = 0; 500 *sp = 0;
501 return s; 501 return s;
502} /* eet_node_string_escape */ 502}
503 503
504static void 504static void
505eet_node_dump_string_escape(void *dumpdata, 505eet_node_dump_string_escape(void *dumpdata,
@@ -514,7 +514,7 @@ eet_node_dump_string_escape(void *dumpdata,
514 514
515 dumpfunc(dumpdata, s); 515 dumpfunc(dumpdata, s);
516 free(s); 516 free(s);
517} /* eet_node_dump_string_escape */ 517}
518 518
519static void 519static void
520eet_node_dump_simple_type(Eet_Node *n, 520eet_node_dump_simple_type(Eet_Node *n,
@@ -578,10 +578,10 @@ case Eet_Type: \
578 default: 578 default:
579 dumpfunc(dumpdata, "???: ???"); 579 dumpfunc(dumpdata, "???: ???");
580 break; 580 break;
581 } /* switch */ 581 }
582 582
583 dumpfunc(dumpdata, ";\n"); 583 dumpfunc(dumpdata, ";\n");
584} /* eet_node_dump_simple_type */ 584}
585 585
586static void 586static void
587eet_node_dump_group_start(int level, 587eet_node_dump_group_start(int level,
@@ -602,7 +602,7 @@ eet_node_dump_group_start(int level,
602 602
603 dumpfunc(dumpdata, eet_node_dump_g_name[chnk_type - EET_G_UNKNOWN]); 603 dumpfunc(dumpdata, eet_node_dump_g_name[chnk_type - EET_G_UNKNOWN]);
604 dumpfunc(dumpdata, " {\n"); 604 dumpfunc(dumpdata, " {\n");
605} /* eet_node_dump_group_start */ 605}
606 606
607static void 607static void
608eet_node_dump_group_end(int level, 608eet_node_dump_group_end(int level,
@@ -611,7 +611,7 @@ eet_node_dump_group_end(int level,
611{ 611{
612 eet_node_dump_level(level, dumpfunc, dumpdata); 612 eet_node_dump_level(level, dumpfunc, dumpdata);
613 dumpfunc(dumpdata, "}\n"); 613 dumpfunc(dumpdata, "}\n");
614} /* eet_node_dump_group_end */ 614}
615 615
616void 616void
617eet_node_dump(Eet_Node *n, 617eet_node_dump(Eet_Node *n,
@@ -676,8 +676,8 @@ eet_node_dump(Eet_Node *n,
676 case EET_T_ULONG_LONG: 676 case EET_T_ULONG_LONG:
677 eet_node_dump_simple_type(n, dumplevel, dumpfunc, dumpdata); 677 eet_node_dump_simple_type(n, dumplevel, dumpfunc, dumpdata);
678 break; 678 break;
679 } /* switch */ 679 }
680} /* eet_node_dump */ 680}
681 681
682void * 682void *
683eet_node_walk(void *parent, 683eet_node_walk(void *parent,
@@ -759,13 +759,13 @@ eet_node_walk(void *parent,
759 case EET_T_ULONG_LONG: 759 case EET_T_ULONG_LONG:
760 me = cb->simple(root->type, &root->data, user_data); 760 me = cb->simple(root->type, &root->data, user_data);
761 break; 761 break;
762 } /* switch */ 762 }
763 763
764 if (parent) 764 if (parent)
765 cb->struct_add(parent, name, me, user_data); 765 cb->struct_add(parent, name, me, user_data);
766 766
767 return me; 767 return me;
768} /* eet_node_walk */ 768}
769 769
770int 770int
771eet_node_init(void) 771eet_node_init(void)
@@ -778,7 +778,7 @@ eet_node_init(void)
778#else 778#else
779 choice = "chained_mempool"; 779 choice = "chained_mempool";
780#endif 780#endif
781 tmp = getenv("EET_MEMPOOL"); 781 tmp = getenv("EINA_MEMPOOL");
782 if (tmp && tmp[0]) 782 if (tmp && tmp[0])
783 choice = tmp; 783 choice = tmp;
784 784
@@ -786,12 +786,12 @@ eet_node_init(void)
786 eina_mempool_add(choice, "eet-node-alloc", NULL, sizeof(Eet_Node), 1024); 786 eina_mempool_add(choice, "eet-node-alloc", NULL, sizeof(Eet_Node), 1024);
787 787
788 return _eet_node_mp ? 1 : 0; 788 return _eet_node_mp ? 1 : 0;
789} /* eet_node_init */ 789}
790 790
791void 791void
792eet_node_shutdown(void) 792eet_node_shutdown(void)
793{ 793{
794 eina_mempool_del(_eet_node_mp); 794 eina_mempool_del(_eet_node_mp);
795 _eet_node_mp = NULL; 795 _eet_node_mp = NULL;
796} /* eet_node_shutdown */ 796}
797 797
diff --git a/libraries/eet/src/lib/eet_utils.c b/libraries/eet/src/lib/eet_utils.c
index 8e591a2..b04ad1b 100644
--- a/libraries/eet/src/lib/eet_utils.c
+++ b/libraries/eet/src/lib/eet_utils.c
@@ -32,5 +32,5 @@ _eet_hash_gen(const char *key,
32 hash_num &= mask; 32 hash_num &= mask;
33 /* return it */ 33 /* return it */
34 return hash_num; 34 return hash_num;
35} /* _eet_hash_gen */ 35}
36 36
diff --git a/libraries/eet/src/tests/Makefile.am b/libraries/eet/src/tests/Makefile.am
index c90a1d5..61158f7 100644
--- a/libraries/eet/src/tests/Makefile.am
+++ b/libraries/eet/src/tests/Makefile.am
@@ -2,6 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
2 2
3AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib \ 4-I$(top_srcdir)/src/lib \
5-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \
5@CHECK_CFLAGS@ \ 6@CHECK_CFLAGS@ \
6@EINA_CFLAGS@ 7@EINA_CFLAGS@
7 8
diff --git a/libraries/eet/src/tests/Makefile.in b/libraries/eet/src/tests/Makefile.in
index bb15127..791f9fd 100644
--- a/libraries/eet/src/tests/Makefile.in
+++ b/libraries/eet/src/tests/Makefile.in
@@ -174,8 +174,6 @@ PACKAGE_URL = @PACKAGE_URL@
174PACKAGE_VERSION = @PACKAGE_VERSION@ 174PACKAGE_VERSION = @PACKAGE_VERSION@
175PATH_SEPARATOR = @PATH_SEPARATOR@ 175PATH_SEPARATOR = @PATH_SEPARATOR@
176PKG_CONFIG = @PKG_CONFIG@ 176PKG_CONFIG = @PKG_CONFIG@
177PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
178PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
179RANLIB = @RANLIB@ 177RANLIB = @RANLIB@
180SED = @SED@ 178SED = @SED@
181SET_MAKE = @SET_MAKE@ 179SET_MAKE = @SET_MAKE@
@@ -246,6 +244,7 @@ version_info = @version_info@
246MAINTAINERCLEANFILES = Makefile.in 244MAINTAINERCLEANFILES = Makefile.in
247AM_CPPFLAGS = \ 245AM_CPPFLAGS = \
248-I$(top_srcdir)/src/lib \ 246-I$(top_srcdir)/src/lib \
247-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \
249@CHECK_CFLAGS@ \ 248@CHECK_CFLAGS@ \
250@EINA_CFLAGS@ 249@EINA_CFLAGS@
251 250
diff --git a/libraries/eet/src/tests/eet_suite.c b/libraries/eet/src/tests/eet_suite.c
index 5230c86..3bbc912 100644
--- a/libraries/eet/src/tests/eet_suite.c
+++ b/libraries/eet/src/tests/eet_suite.c
@@ -24,6 +24,8 @@
24 24
25#include "eet_suite.h" 25#include "eet_suite.h"
26 26
27#define CERT_DIR ((*TESTS_SRC_DIR == '/') ? TESTS_SRC_DIR : "src/tests/" TESTS_SRC_DIR)
28
27START_TEST(eet_test_init) 29START_TEST(eet_test_init)
28{ 30{
29 int ret; 31 int ret;
@@ -211,21 +213,21 @@ _eet_test_basic_check(Eet_Test_Basic_Type *result,
211 fail_if(result->empty != NULL); 213 fail_if(result->empty != NULL);
212 if (i == 0) 214 if (i == 0)
213 { 215 {
214 Eet_Test_Basic_Type *tmp; 216 Eet_Test_Basic_Type *tmp2;
215 217
216 tmp = result->with; 218 tmp2 = result->with;
217 fail_if(tmp == NULL); 219 fail_if(tmp2 == NULL);
218 220
219 fail_if(tmp->c != EET_TEST_CHAR); 221 fail_if(tmp2->c != EET_TEST_CHAR);
220 fail_if(tmp->s != EET_TEST_SHORT); 222 fail_if(tmp2->s != EET_TEST_SHORT);
221 fail_if(tmp->i != EET_TEST_INT + i + 1); 223 fail_if(tmp2->i != EET_TEST_INT + i + 1);
222 fail_if(tmp->l != (long long)EET_TEST_LONG_LONG); 224 fail_if(tmp2->l != (long long)EET_TEST_LONG_LONG);
223 fail_if(strcmp(tmp->str, EET_TEST_STRING) != 0); 225 fail_if(strcmp(tmp2->str, EET_TEST_STRING) != 0);
224 fail_if(strcmp(tmp->istr, EET_TEST_STRING) != 0); 226 fail_if(strcmp(tmp2->istr, EET_TEST_STRING) != 0);
225 fail_if(tmp->uc != EET_TEST_CHAR); 227 fail_if(tmp2->uc != EET_TEST_CHAR);
226 fail_if(tmp->us != EET_TEST_SHORT); 228 fail_if(tmp2->us != EET_TEST_SHORT);
227 fail_if(tmp->ui != EET_TEST_INT); 229 fail_if(tmp2->ui != EET_TEST_INT);
228 fail_if(tmp->ul != EET_TEST_LONG_LONG); 230 fail_if(tmp2->ul != EET_TEST_LONG_LONG);
229 } 231 }
230 else 232 else
231 fail_if(result->with != NULL); 233 fail_if(result->with != NULL);
@@ -1640,7 +1642,7 @@ START_TEST(eet_identity_simple)
1640 eet_init(); 1642 eet_init();
1641 1643
1642 fail_if(!(file = tmpnam(file))); 1644 fail_if(!(file = tmpnam(file)));
1643 fail_if(chdir("src/tests")); 1645 fail_if(chdir(CERT_DIR));
1644 fail_if(!(noread = fopen("/dev/null", "w"))); 1646 fail_if(!(noread = fopen("/dev/null", "w")));
1645 1647
1646 /* Sign an eet file. */ 1648 /* Sign an eet file. */
@@ -1707,7 +1709,7 @@ START_TEST(eet_identity_open_simple)
1707 1709
1708 eet_init(); 1710 eet_init();
1709 1711
1710 fail_if(chdir("src/tests")); 1712 fail_if(chdir(CERT_DIR));
1711 1713
1712 k = eet_identity_open("cert.pem", "key.pem", NULL); 1714 k = eet_identity_open("cert.pem", "key.pem", NULL);
1713 fail_if(!k); 1715 fail_if(!k);
@@ -1725,7 +1727,7 @@ START_TEST(eet_identity_open_pkcs8)
1725 1727
1726 eet_init(); 1728 eet_init();
1727 1729
1728 fail_if(chdir("src/tests")); 1730 fail_if(chdir(CERT_DIR));
1729 1731
1730 k = eet_identity_open("cert.pem", "key_enc_none.pem", NULL); 1732 k = eet_identity_open("cert.pem", "key_enc_none.pem", NULL);
1731 fail_if(!k); 1733 fail_if(!k);
@@ -1774,7 +1776,7 @@ START_TEST(eet_identity_open_pkcs8_enc)
1774 1776
1775 eet_init(); 1777 eet_init();
1776 1778
1777 fail_if(chdir("src/tests")); 1779 fail_if(chdir(CERT_DIR));
1778 1780
1779 k = eet_identity_open("cert.pem", "key_enc.pem", NULL); 1781 k = eet_identity_open("cert.pem", "key_enc.pem", NULL);
1780 fail_if(k); 1782 fail_if(k);
@@ -1810,7 +1812,7 @@ START_TEST(eet_cipher_decipher_simple)
1810 eet_init(); 1812 eet_init();
1811 1813
1812 fail_if(!(file = tmpnam(file))); 1814 fail_if(!(file = tmpnam(file)));
1813 fail_if(chdir("src/tests")); 1815 fail_if(chdir(CERT_DIR));
1814 1816
1815 /* Crypt an eet file. */ 1817 /* Crypt an eet file. */
1816 ef = eet_open(file, EET_FILE_MODE_WRITE); 1818 ef = eet_open(file, EET_FILE_MODE_WRITE);
generated by cgit v1.1 at 2024-12-26 15:20:10 +0000