summaryrefslogtreecommitdiff
path: root/legacy/eet
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2008-10-26 07:05:11 +0000
committerVincent Torri <vincent.torri@gmail.com>2008-10-26 07:05:11 +0000
commitf375b8fd4f6b91c42ee561051c89d9a2c9ee1e93 (patch)
treecebe32f04120f64f86104add827c668af61edc5b /legacy/eet
parentff6d285c071736b30131b718fd7a2a11c34eef68 (diff)
autotools cleanups:
* reorganize configure.ac * select default opptions in configure.ac (disable openssl for windows ce) * fix Libs.private field and add Requires field in eep.pc * rename eet.c.in to eet.dox.in * use css file from other packages. Now the doc is correctly displayd (need a rename of eet.css to e.css, though. will be next commit) SVN revision: 37114
Diffstat (limited to 'legacy/eet')
-rw-r--r--legacy/eet/Makefile.am4
-rw-r--r--legacy/eet/configure.ac341
-rw-r--r--legacy/eet/doc/Doxyfile2
-rw-r--r--legacy/eet/doc/Makefile.am25
-rw-r--r--legacy/eet/doc/eet.css317
-rw-r--r--legacy/eet/doc/eet.dox.in (renamed from legacy/eet/doc/eet.c.in)0
-rw-r--r--legacy/eet/eet.pc.in3
-rw-r--r--legacy/eet/src/bin/Makefile.am3
-rw-r--r--legacy/eet/src/lib/Eet_private.h4
-rw-r--r--legacy/eet/src/lib/Makefile.am6
10 files changed, 396 insertions, 309 deletions
diff --git a/legacy/eet/Makefile.am b/legacy/eet/Makefile.am
index ebc8bce346..b4f9833da7 100644
--- a/legacy/eet/Makefile.am
+++ b/legacy/eet/Makefile.am
@@ -14,7 +14,9 @@ depcomp \
14install-sh \ 14install-sh \
15ltmain.sh \ 15ltmain.sh \
16missing \ 16missing \
17eet_docs.tar.gz \ 17$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
18$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \
19$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2 \
18m4/libtool.m4 \ 20m4/libtool.m4 \
19m4/lt~obsolete.m4 \ 21m4/lt~obsolete.m4 \
20m4/ltoptions.m4 \ 22m4/ltoptions.m4 \
diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac
index aae04e5c4f..10bdfc652f 100644
--- a/legacy/eet/configure.ac
+++ b/legacy/eet/configure.ac
@@ -12,13 +12,6 @@ AC_ISC_POSIX
12AM_INIT_AUTOMAKE(1.6 dist-bzip2) 12AM_INIT_AUTOMAKE(1.6 dist-bzip2)
13AM_CONFIG_HEADER(config.h) 13AM_CONFIG_HEADER(config.h)
14 14
15AC_PROG_CC
16AM_PROG_CC_STDC
17AC_HEADER_STDC
18AC_C_CONST
19AM_PROG_CC_C_O
20AC_C___ATTRIBUTE__
21
22AC_LIBTOOL_WIN32_DLL 15AC_LIBTOOL_WIN32_DLL
23define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl 16define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
24define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl 17define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
@@ -31,38 +24,145 @@ SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
31version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" 24version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
32AC_SUBST(version_info) 25AC_SUBST(version_info)
33 26
34PKG_PROG_PKG_CONFIG
35 27
36WIN32_CFLAGS="" 28### Default options with respect to host
37WIN32_LIBS="" 29
38lt_enable_auto_import=""
39case "$host_os" in 30case "$host_os" in
40 mingw* | cegcc*) 31 mingw32ce* | cegcc*)
41 PKG_CHECK_MODULES([EVIL], [evil]) 32 want_openssl="no"
42 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed]) 33 want_cypher="no"
43 dnl needed for correct definition of EAPI 34 want_signature="no"
44 AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built]) 35 ;;
45 lt_enable_auto_import="-Wl,--enable-auto-import" 36 *)
37 want_openssl="auto"
38 want_cypher="yes"
39 want_signature="yes"
46 ;; 40 ;;
47esac 41esac
48 42
43requirement_eet=""
44
45
46### Additional options to configure
47
48# Old eet file format support
49
50old_eet_file_format="yes"
51AC_ARG_ENABLE(old-eet-file-format,
52 [AC_HELP_STRING(
53 [--disable-old-eet-file-format],
54 [disable old eet file format support. [[default=enabled]]]
55 )],
56 [old_eet_file_format=$enableval]
57)
58AC_MSG_CHECKING([whether to support old eet file format])
59AC_MSG_RESULT([${old_eet_file_format=$enableval}])
60
61if test "x${old_eet_file_format}" = "xyes" ; then
62 AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format])
63else
64 AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
65fi
66
67# Openssl support
68
69AC_ARG_ENABLE([openssl],
70 [AC_HELP_STRING([--disable-openssl], [disable openssl eet support])],
71 [want_openssl=$enableval]
72)
73AC_MSG_CHECKING([whether to use OpenSSL])
74AC_MSG_RESULT([${want_openssl}])
75
76# Cryptography support
77
78AC_ARG_ENABLE([cypher],
79 [AC_HELP_STRING([--disable-cypher], [disable cypher support for eet API])],
80 [want_cypher=$enableval]
81)
82AC_MSG_CHECKING([whether to use cypher])
83AC_MSG_RESULT([${want_cypher}])
84
85AC_ARG_ENABLE([signature],
86 [AC_HELP_STRING([--disable-signature], [disable signature file support for eet])],
87 [want_signature=$enableval]
88)
89AC_MSG_CHECKING([whether to use signature])
90AC_MSG_RESULT([${want_signature}])
91
92# Assert or fail.
93prefer_assert="no"
94AC_ARG_ENABLE([assert],
95 [AC_HELP_STRING([--enable-assert], [enable assert, [[default=disabled]]])],
96 [prefer_assert=$enableval]
97)
98
99# Unit tests, coverage and benchmarking
100
101EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
102EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"])
103
104if test "x${prefer_assert}" = "xno"; then
105 DEBUG_CFLAGS="-DNDEBUG"
106else
107# use debug symbols and set DEBUG if coverage support is enabled
108 DEBUG_CFLAGS="${EFL_DEBUG_CFLAGS}"
109fi
110AC_SUBST(DEBUG_CFLAGS)
111
112
113### Checks for libraries
114
115PKG_PROG_PKG_CONFIG
116
117# Evil library for compilation on Windows
118
119EFL_EET_BUILD=""
49case "$host_os" in 120case "$host_os" in
50 mingw32ce*) 121 mingw* | cegcc*)
51 WIN32_LIBS="-lws2" 122 PKG_CHECK_MODULES([EVIL], [evil])
52 ;; 123 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed])
53 mingw*) 124 requirement_eet="evil ${requirement_eet}"
54 WIN32_LIBS="-lws2_32" 125 EFL_EET_BUILD="-DEFL_EET_BUILD"
55 ;; 126 ;;
56 cegcc*)
57 WIN32_CFLAGS="-mwin32"
58 WIN32_LIBS="-lws2"
59 ;;
60esac 127esac
61AC_SUBST(WIN32_CFLAGS) 128AC_SUBST(EFL_EET_BUILD)
62AC_SUBST(WIN32_LIBS)
63AC_SUBST(lt_enable_auto_import)
64 129
65AC_FUNC_ALLOCA 130# Eina library
131
132PKG_CHECK_MODULES(EINA, [eina-0])
133requirement_eet="eina-0 ${requirement_eet}"
134
135# Openssl library
136have_openssl="no"
137if test "x${want_openssl}" = "xyes" -o "x${want_openssl}" = "xauto" ; then
138 PKG_CHECK_MODULES(OPENSSL, openssl,
139 [
140 have_openssl="yes"
141 AC_DEFINE(HAVE_OPENSSL, 1, [Have Openssl support])
142 requirement_eet="openssl ${requirement_eet}"
143 ])
144fi
145
146have_cypher="no"
147if test "x${have_openssl}" = "xyes" -a "x${want_cypher}" = "xyes" ; then
148 have_cypher="yes"
149 AC_DEFINE(HAVE_CYPHER, 1, [Have cypher support built in eet])
150fi
151
152AC_MSG_CHECKING(whether to activate cypher support in eet)
153AC_MSG_RESULT(${have_cypher})
154
155have_signature="no"
156if test "x${have_openssl}" = "xyes" -a "x${want_signature}" = "xyes" ; then
157 have_signature="yes"
158 AC_DEFINE(HAVE_SIGNATURE, 1, [Have signature support for eet file])
159fi
160
161AC_MSG_CHECKING(whether to activate signature support in eet)
162AC_MSG_RESULT(${have_signature})
163
164
165### Checks for header files
66 166
67AC_CHECK_HEADER([zlib.h], 167AC_CHECK_HEADER([zlib.h],
68 [dummy="yes"], 168 [dummy="yes"],
@@ -78,126 +178,121 @@ AC_CHECK_HEADER([fnmatch.h],
78 [dummy="yes"], 178 [dummy="yes"],
79 [AC_MSG_ERROR([Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file. MinGW users: see the INSTALL file])]) 179 [AC_MSG_ERROR([Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file. MinGW users: see the INSTALL file])])
80 180
81AC_CHECK_FUNCS([fnmatch], [res="yes"], [res="no"])
82if test "x$res" = "xno"; then
83 AC_SEARCH_LIBS([fnmatch],
84 [fnmatch iberty evil],
85 [res="yes"],
86 [res="no"])
87 if test "x$res" = "xno"; then
88 AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch, nor libiberty, nor libevil])
89 fi
90fi
91 181
92dnl These are needed for fmemopen/open_memstream 182### Checks for programs
93AC_DEFINE(_GNU_SOURCE, , [Enable GNU extensions]) 183AC_PROG_CC
94 184
95AC_CHECK_FUNCS(fmemopen open_memstream realpath) 185# doxygen program for documentation building
96 186
97dnl Check whether the null pointer is zero on this arch 187EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
98AC_MSG_CHECKING([value of the null pointer]) 188
99AC_TRY_RUN([ 189
190### Checks for types
191
192
193### Checks for structures
194
195
196### Checks for compiler characteristics
197AM_PROG_CC_C_O
198AC_C_CONST
199AC_C_INLINE
200AC_PROG_CC_STDC
201AC_C___ATTRIBUTE__
202
203# Check whether the null pointer is zero on this arch
204AC_TRY_RUN(
205 [
100#include <stdlib.h> 206#include <stdlib.h>
101int main (int argc, char **argv) { 207int main (int argc, char **argv) {
102 void *foo = NULL; 208 void *foo = NULL;
103 int bar = (int)foo; 209 int bar = (int)foo;
104 return (int)foo; 210 return (int)foo;
105} 211}
106], AC_MSG_RESULT([yes]), [ 212 ],
107 AC_MSG_RESULT([no]) 213 [have_null="yes"],
108 AC_MSG_WARN([Your system is a bit too funny, eet might not work properly]) 214 [have_null="no"],
109], AC_MSG_WARN([Cannot check when cross-compiling -- assuming null is okay]) 215 [
110) 216 AC_MSG_WARN([Cannot check when cross-compiling -- assuming null is okay])
111 217 have_null="yes"
112dnl Unit Tests 218 ])
113EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"]) 219AC_MSG_CHECKING([value of the null pointer])
114EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"]) 220AC_MSG_RESULT([${have_null}])
115 221
116dnl Openssl support 222if test ! "x${have_null}" = "xyes" ; then
117want_openssl="auto" 223 AC_MSG_WARN([Your system is a bit too funny, eet might not work properly])
118have_openssl="no"
119AC_ARG_ENABLE(openssl,
120 [AC_HELP_STRING([--disable-openssl], [disable openssl eet support])],
121 [ want_openssl=$enableval ]
122)
123if test "x$want_openssl" = "xyes" -o "x$want_openssl" = "xauto"; then
124 PKG_CHECK_MODULES(OPENSSL, openssl,
125 [
126 have_openssl="yes"
127 AC_DEFINE(HAVE_OPENSSL, 1, [Have Openssl support])
128 ])
129fi 224fi
130 225
131dnl Crypto option 226# These are needed for fmemopen/open_memstream
132want_cypher="yes" 227AC_DEFINE(_GNU_SOURCE, , [Enable GNU extensions])
133have_cypher="no"
134want_signature="yes"
135have_signature="no"
136 228
137AC_ARG_ENABLE(cypher, 229EET_CPPFLAGS=""
138 [AC_HELP_STRING([--disable-cypher], [disable cypher support for eet API])], 230EET_CFLAGS=""
139 [ want_cypher=$enableval ] 231case "$host_os" in
140) 232 mingw32ce*)
233 EET_CPPFLAGS="-D_WIN32_WCE=0x0420"
234 ;;
235 cegcc*)
236 EET_CPPFLAGS="-D_WIN32_WCE=0x0420"
237 EET_CFLAGS="-mwin32"
238 ;;
239esac
240AC_SUBST(EET_CPPFLAGS)
241AC_SUBST(EET_CFLAGS)
141 242
142if test "x$have_openssl" = "xyes" -a "x$want_cypher" = "xyes"; then
143 have_cypher="yes"
144 AC_DEFINE(HAVE_CYPHER, 1, [Have cypher support built in eet])
145fi
146 243
147AC_MSG_CHECKING(whether to activate cypher support in eet) 244### Checks for linker characteristics
148AC_MSG_RESULT($have_cypher)
149 245
150AC_ARG_ENABLE(signature, 246EET_LIBS=""
151 [AC_HELP_STRING([--disable-signature], [disable signature file support for eet])], 247case "$host_os" in
152 [ want_signature=$enableval ] 248 mingw32ce*)
153) 249 EET_LIBS="-lws2"
250 ;;
251 cegcc*)
252 EET_LIBS="-lws2"
253 ;;
254 mingw*)
255 EET_LIBS="-lws2_32"
256 ;;
257esac
258AC_SUBST(EET_LIBS)
154 259
155if test "x$have_openssl" = "xyes" -a "x$want_signature" = "xyes"; then 260lt_enable_auto_import=""
156 have_signature="yes" 261case "$host_os" in
157 AC_DEFINE(HAVE_SIGNATURE, 1, [Have signature support for eet file]) 262 mingw* | cegcc*)
158fi 263 lt_enable_auto_import="-Wl,--enable-auto-import"
264 ;;
265esac
266AC_SUBST(lt_enable_auto_import)
159 267
160AC_MSG_CHECKING(whether to activate signature support in eet)
161AC_MSG_RESULT($have_signature)
162 268
163dnl Disable support for old eet file format. 269### Checks for library functions
164old_eet_file_format="yes" 270AC_FUNC_ALLOCA
165AC_ARG_ENABLE(old-eet-file-format,
166 AC_HELP_STRING(
167 [--disable-old-eet-file-format],
168 [disable old eet file format support. [[default=enabled]]]
169 ),
170 [ old_eet_file_format=$enableval ]
171)
172if test "x$old_eet_file_format" = "xyes"; then
173 AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format])
174else
175 AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
176fi
177 271
178dnl Assert or fail. 272AC_CHECK_FUNCS(fmemopen open_memstream realpath)
179prefer_assert="no" 273
180AC_ARG_ENABLE(assert, 274fnmatch_libs=""
181 AC_HELP_STRING( 275AC_CHECK_FUNCS([fnmatch], [res="yes"], [res="no"])
182 [--enable-assert], 276if test "x$res" = "xno"; then
183 [enable assert, [[default=disabled]]] 277 AC_SEARCH_LIBS([fnmatch],
184 ), 278 [fnmatch iberty evil],
185 [ prefer_assert=$enableval ] 279 [res="yes"],
186) 280 [res="no"])
187if test "x$prefer_assert" = "xno"; then 281 if test "x$res" = "xno"; then
188 DEBUG_CFLAGS="-DNDEBUG" 282 AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch, nor libiberty, nor libevil])
283 fi
284 fnmatch_libs="${ac_cv_search_fnmatch}"
189fi 285fi
190AC_SUBST(DEBUG_CFLAGS) 286AC_SUBST(fnmatch_libs)
191 287
192PKG_CHECK_MODULES(EINA, [eina-0])
193 288
194EFL_CHECK_DOXYGEN([enable_doc="yes"], [enable_doc="no"]) 289AC_SUBST(requirement_eet)
195 290
196AC_OUTPUT([ 291AC_OUTPUT([
197Makefile 292Makefile
198eet.pc 293eet.pc
199doc/Makefile 294doc/Makefile
200doc/eet.c 295doc/eet.dox
201src/Makefile 296src/Makefile
202src/lib/Makefile 297src/lib/Makefile
203src/bin/Makefile 298src/bin/Makefile
diff --git a/legacy/eet/doc/Doxyfile b/legacy/eet/doc/Doxyfile
index 941fdea839..bdcd670b2c 100644
--- a/legacy/eet/doc/Doxyfile
+++ b/legacy/eet/doc/Doxyfile
@@ -1,7 +1,7 @@
1PROJECT_NAME = Eet 1PROJECT_NAME = Eet
2PROJECT_NUMBER = 2PROJECT_NUMBER =
3OUTPUT_DIRECTORY = . 3OUTPUT_DIRECTORY = .
4INPUT = eet.c ../src/lib 4INPUT = eet.dox ../src/lib
5IMAGE_PATH = img 5IMAGE_PATH = img
6OUTPUT_LANGUAGE = English 6OUTPUT_LANGUAGE = English
7GENERATE_HTML = YES 7GENERATE_HTML = YES
diff --git a/legacy/eet/doc/Makefile.am b/legacy/eet/doc/Makefile.am
index 8d3bf95eea..bbf1c9e543 100644
--- a/legacy/eet/doc/Makefile.am
+++ b/legacy/eet/doc/Makefile.am
@@ -1,23 +1,25 @@
1 1
2MAINTAINERCLEANFILES = Makefile.in eet.c 2MAINTAINERCLEANFILES = Makefile.in eet.dox
3 3
4.PHONY: doc 4.PHONY: doc
5 5
6PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
7
6if EFL_BUILD_DOC 8if EFL_BUILD_DOC
7 9
8doc-clean: 10doc-clean:
9 rm -rf html/ latex/ man/ xml/ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar* 11 rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
10 12
11doc: all doc-clean 13doc: all doc-clean
12 $(DOXYGEN) 14 $(DOXYGEN)
13 cp img/*.png html/ 15 cp img/* html/
14 rm -rf $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION).tar* 16 rm -rf $(PACKAGE_DOCNAME).tar*
15 mkdir -p $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION)/doc 17 mkdir -p $(PACKAGE_DOCNAME)/doc
16 cp -R html/ latex/ man/ $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION)/doc 18 cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
17 tar cf $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION).tar $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION) 19 tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
18 bzip2 -9 $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION).tar 20 bzip2 -9 $(PACKAGE_DOCNAME).tar
19 rm -rf $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION) 21 rm -rf $(PACKAGE_DOCNAME)/
20 mv $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION).tar.bz2 $(top_srcdir) 22 mv $(PACKAGE_DOCNAME).tar.bz2 $(top_srcdir)
21 23
22clean-local: doc-clean 24clean-local: doc-clean
23 25
@@ -28,5 +30,4 @@ doc:
28 30
29endif 31endif
30 32
31EXTRA_DIST = Doxyfile eet.css foot.html head.html img/ eet.c.in 33EXTRA_DIST = Doxyfile eet.css foot.html head.html img/ eet.dox.in
32
diff --git a/legacy/eet/doc/eet.css b/legacy/eet/doc/eet.css
index 6117b397ba..604ee7ffd8 100644
--- a/legacy/eet/doc/eet.css
+++ b/legacy/eet/doc/eet.css
@@ -1,178 +1,161 @@
1td.md { 1body {
2 background-color: #ffffff; 2 background: url("b.png");
3 font-family: monospace; 3 background-repeat: repeat-x;
4 text-align: left; 4 background-position: top left;
5 vertical-align: center; 5 background-color: #f4f4f4;
6 font-size: 10; 6 text-align: center;
7 padding-right : 1px; 7 font-family: sans-serif;
8 padding-top : 1px; 8 padding: 0;
9 padding-left : 1px; 9 margin: 0;
10 padding-bottom : 1px;
11 margin-left : 1px;
12 margin-right : 1px;
13 margin-top : 1px;
14 margin-bottom : 1px
15} 10}
16td.mdname { 11
17 font-family: monospace; 12div.main {
18 text-align: left; 13 margin: 1em auto;
19 vertical-align: center; 14 vertical-align: top;
20 font-size: 10; 15 font-family: "Bitstream Vera", "Vera", "Trebuchet MS", Trebuchet, Tahoma, sans-serif;
21 padding-right : 1px; 16 color: #444444;
22 padding-top : 1px; 17 font-size: 0.8em;
23 padding-left : 1px; 18 text-align: justify;
24 padding-bottom : 1px; 19 width: 80%;
25 margin-left : 1px;
26 margin-right : 1px;
27 margin-top : 1px;
28 margin-bottom : 1px
29}
30h1
31{
32 text-align: center;
33 color: #333333
34}
35h2
36{
37 text-align: left;
38 color: #333333
39}
40h3
41{
42 text-align: left;
43 color: #333333
44}
45a:link
46{
47 text-decoration: none;
48 color: #444444;
49 font-weight: bold;
50}
51a:visited
52{
53 text-decoration: none;
54 color: #666666;
55 font-weight: bold;
56}
57a:hover
58{
59 text-decoration: none;
60 color: #000000;
61 font-weight: bold;
62}
63a.nav:link
64{
65 text-decoration: none;
66 color: #444444;
67 font-weight: normal;
68}
69a.nav:visited
70{
71 text-decoration: none;
72 color: #666666;
73 font-weight: normal;
74}
75a.nav:hover
76{
77 text-decoration: none;
78 color: #000000;
79 font-weight: normal;
80}
81a.qindex:link
82{
83 text-decoration: none;
84 color: #444444;
85 font-weight: normal;
86}
87a.qindex:visited
88{
89 text-decoration: none;
90 color: #666666;
91 font-weight: normal;
92}
93a.qindex:hover
94{
95 text-decoration: none;
96 color: #000000;
97 font-weight: normal;
98}
99p
100{
101 color: #000000;
102 font-family: sans-serif;
103 font-size: 10;
104} 20}
105body { 21
106 background-image: url("hilite.png"); 22td.t { background-image:url("t.gif"); }
107 background-repeat: no-repeat; 23td.t[class] { background-image:url("t.png"); }
108 background-position: left top; 24td.tl { background-image:url("tl.gif"); }
109 background-color: #dddddd; 25td.tl[class] { background-image:url("tl.png"); }
110 color: #000000; 26
111 font-family: sans-serif; 27td.nav, td.lnav, td.rnav {
112 padding: 8px; 28 align: middle;
113 margin: 0; 29 text-align: center;
30 vertical-align: middle;
31 width: 100px;
32 height: 25px;
33 font-family: "Bitstream Vera", "Vera", "Trebuchet MS", Trebuchet, Tahoma, sans-serif;
34 color: #000000;
35 font-size: 9px;
36 font-weight: bold;
37 white-space: no-wrap;
38}
39
40td.lnav[class] { background-image:url("n.png"); }
41td.lnav[class] { background-image:url("n.png"); }
42td.rnav { background-image:url("n.gif"); }
43td.rnav[class] { background-image:url("n.png"); }
44
45hr {
46 width: 200px;
47 height: 1px;
48 background: #dddddd;
49 border: 0;
114} 50}
115div.fragment 51
116{ 52p { color: #444444 ;}
117 background-image: url("hilite.png"); 53p.tiny, small {
118 background-repeat: no-repeat; 54 color: #888888;
119 background-position: left top; 55 font-size: 0.5em;
120 border: thin solid #888888;
121 background-color: #eeeeee;
122 padding: 4px;
123 text-align: left;
124 vertical-align: center;
125 font-size: 12;
126} 56}
127hr 57
128{ 58h1 {
129 border: 0; 59 text-align: center;
130 background-color: #000000; 60 font-size: 1.3em;
131 width: 80%;
132 height: 1;
133} 61}
134dl 62
135{ 63h2 { font-size: 1.1em; }
136 background-image: url("hilite.png"); 64h3 { font-size: 0.9em; }
137 background-repeat: no-repeat; 65
138 background-position: left top; 66span.keyword { color: #008000; }
139 border: thin solid #aaaaaa; 67span.keywordtype { color: #604020; }
140 background-color: #eeeeee; 68span.keywordflow { color: #e08000; }
141 padding: 4px; 69span.comment { color: #800000; }
142 text-align: left; 70span.preprocessor { color: #806020; }
143 vertical-align: center; 71span.stringliteral { color: #002080; }
144 font-size: 12; 72span.charliteral { color: #008080; }
73
74a:link {
75 color: #445566;
76 text-decoration: underline;
77}
78
79a:visited {
80 color: #667788;
81 text-decoration: underline;
82}
83
84a:active {
85 color: #88cccc;
86 text-decoration: none;
145} 87}
146em 88
147{ 89a:hover {
148 color: #334466; 90 color: #112266;
149 font-family: courier; 91 text-decoration: underline;
150 font-size: 10; 92}
151 font-style: normal; 93
94a.nav {
95 text-decoration: none;
96 display: block;
97}
98
99a.nav:link, a.nav:visited { color: #888888; }
100a.nav:active { color: #000000; }
101a.nav:hover { color: #444444; }
102a.code:link, a.code:visited { text-decoration: none; }
103
104div.fragment {
105 font-size: 1em;
106 border: 1px dotted #cccccc;
107 background-color: #ffffff;
108 text-align: left;
109 vertical-align: middle;
110 padding: 2px;
111 margin-left: 25px;
112 margin-right: 25px;
113 overflow: auto;
152} 114}
153 115
154div.nav 116td.indexkey {
155{ 117 font-weight: bold;
156 border: thin solid #000000; 118 padding-left: 10px;
157 background-color: #ffffff; 119 padding-right: 0;
158 padding: 1px; 120 padding-top: 2px;
159 text-align: center; 121 padding-bottom: 0px;
160 vertical-align: center; 122 margin: 0;
161 font-size: 12; 123 margin-top: 2px;
124 margin-bottom: 2px;
125 border: 1px dotted #cccccc;
126 border-right: 0px dotted #cccccc;
162} 127}
163div.body 128
164{ 129td.indexvalue {
165 border: thin solid #000000; 130 font-style: italic;
166 background-color: #ffffff; 131 padding-right: 10px;
167 padding: 4px; 132 padding-left: 0;
168 text-align: left; 133 padding-top: 2px;
169 font-size: 10; 134 padding-bottom: 2px;
135 margin: 0;
136 margin-top: 2px;
137 margin-bottom: 2px;
138 border: 1px dotted #cccccc;
139 border-left: 0px dotted #cccccc;
170} 140}
171div.diag 141
172{ 142.mdescRight { font-style: italic; }
173 border: thin solid #888888; 143.memitem {
174 background-color: #eeeeee; 144 padding-left: 2px;
175 padding: 4px; 145 padding-right: 2px;
176 text-align: center; 146 border: 1px dotted #cccccc;
177 font-size: 8; 147 background-color: #ffffff;
148}
149.memname {
150 white-space: nowrap;
151 font-weight: bold;
152}
153.paramname { font-weight: normal; }
154
155div.ah {
156 border: thin solid #888888;
157 font-weight: bold;
158 margin-bottom: 3px;
159 margin-top: 3px;
178} 160}
161
diff --git a/legacy/eet/doc/eet.c.in b/legacy/eet/doc/eet.dox.in
index 3d6c02664b..3d6c02664b 100644
--- a/legacy/eet/doc/eet.c.in
+++ b/legacy/eet/doc/eet.dox.in
diff --git a/legacy/eet/eet.pc.in b/legacy/eet/eet.pc.in
index 669d03cbd7..1c5ec42f7b 100644
--- a/legacy/eet/eet.pc.in
+++ b/legacy/eet/eet.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
5 5
6Name: eet 6Name: eet
7Description: Library for speedy data storage, retrieval, and compression 7Description: Library for speedy data storage, retrieval, and compression
8Requires: @requirement_eet@
8Version: @VERSION@ 9Version: @VERSION@
9Libs: -L${libdir} -leet 10Libs: -L${libdir} -leet
10Libs.private: -lz -ljpeg @fnmatch_libs@ @WIN32_LIBS@ -lm 11Libs.private: @OPENSSL_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ @EET_LIBS@ @fnmatch_libs@ -ljpeg -lz -lm
11Cflags: -I${includedir} 12Cflags: -I${includedir}
diff --git a/legacy/eet/src/bin/Makefile.am b/legacy/eet/src/bin/Makefile.am
index 04c9f7be6e..1415f07b2b 100644
--- a/legacy/eet/src/bin/Makefile.am
+++ b/legacy/eet/src/bin/Makefile.am
@@ -8,11 +8,12 @@ AM_CPPFLAGS = \
8-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 8-DPACKAGE_BIN_DIR=\"$(bindir)\" \
9-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 9-DPACKAGE_LIB_DIR=\"$(libdir)\" \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
11@EET_CPPFLAGS@ \
11@EVIL_CFLAGS@ 12@EVIL_CFLAGS@
12 13
13bin_PROGRAMS = eet 14bin_PROGRAMS = eet
14 15
15eet_SOURCES = eet_main.c 16eet_SOURCES = eet_main.c
16eet_CFLAGS = @WIN32_CFLAGS@ 17eet_CFLAGS = @EET_CFLAGS@
17eet_LDADD = $(top_builddir)/src/lib/libeet.la 18eet_LDADD = $(top_builddir)/src/lib/libeet.la
18eet_LDFLAGS = @lt_enable_auto_import@ -Wl,--as-needed 19eet_LDFLAGS = @lt_enable_auto_import@ -Wl,--as-needed
diff --git a/legacy/eet/src/lib/Eet_private.h b/legacy/eet/src/lib/Eet_private.h
index 6ba14b9c6b..617ca10d6c 100644
--- a/legacy/eet/src/lib/Eet_private.h
+++ b/legacy/eet/src/lib/Eet_private.h
@@ -12,7 +12,9 @@
12# endif 12# endif
13#endif 13#endif
14 14
15#include "config.h" 15#ifdef HAVE_CONFIG_H
16# include <config.h>
17#endif
16 18
17#ifdef HAVE_OPENSSL 19#ifdef HAVE_OPENSSL
18#include <openssl/evp.h> 20#include <openssl/evp.h>
diff --git a/legacy/eet/src/lib/Makefile.am b/legacy/eet/src/lib/Makefile.am
index f7c13fa1a4..c93b86be5a 100644
--- a/legacy/eet/src/lib/Makefile.am
+++ b/legacy/eet/src/lib/Makefile.am
@@ -10,6 +10,8 @@ AM_CPPFLAGS = \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
11@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@ \
12@EINA_CFLAGS@ \ 12@EINA_CFLAGS@ \
13@EET_CPPFLAGS@ \
14@EFL_EET_BUILD@ \
13@EFL_COVERAGE_CFLAGS@ \ 15@EFL_COVERAGE_CFLAGS@ \
14@OPENSSL_CFLAGS@ 16@OPENSSL_CFLAGS@
15 17
@@ -25,8 +27,8 @@ eet_cypher.c \
25eet_dictionary.c \ 27eet_dictionary.c \
26eet_utils.c 28eet_utils.c
27 29
28libeet_la_CFLAGS = @WIN32_CFLAGS@ 30libeet_la_CFLAGS = @EET_CFLAGS@ @DEBUG_CFLAGS@
29libeet_la_LIBADD = @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ @EINA_LIBS@ -lz -ljpeg -lm 31libeet_la_LIBADD = @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EET_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ -lz -ljpeg -lm
30libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ 32libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
31 33
32EXTRA_DIST = Eet_private.h 34EXTRA_DIST = Eet_private.h