summaryrefslogtreecommitdiff
path: root/legacy/eet
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2008-10-16 08:41:40 +0000
committerVincent Torri <vincent.torri@gmail.com>2008-10-16 08:41:40 +0000
commit3e4465c4fac433a17bd93da7df2a6b4d5e4b26df (patch)
tree375048807db7bed4ddf33e55604c3c70226d7527 /legacy/eet
parenta3f8f5f27b34f658950da3be95aea9bf93a59d8b (diff)
* add m4 macro for documentation, unit tests and coverage
* put documentation related files in doc, remove gendoc and add a doc rule to create the documentation and a doc tarball named eet-doc-$(version).tar.bz2 * minor cleanup in the autotools SVN revision: 36706
Diffstat (limited to 'legacy/eet')
-rw-r--r--legacy/eet/Doxyfile139
-rw-r--r--legacy/eet/Makefile.am23
-rw-r--r--legacy/eet/configure.ac171
-rw-r--r--legacy/eet/doc/Doxyfile4
-rw-r--r--legacy/eet/doc/Makefile.am56
-rw-r--r--legacy/eet/doc/eet.c.in (renamed from legacy/eet/eet.c.in)0
-rwxr-xr-xlegacy/eet/gendoc8
-rw-r--r--legacy/eet/m4/ac_attribute.m414
-rw-r--r--legacy/eet/m4/doxygen.m473
-rw-r--r--legacy/eet/m4/efl_coverage.m464
-rw-r--r--legacy/eet/m4/efl_doxygen.m488
-rw-r--r--legacy/eet/m4/efl_tests.m444
-rw-r--r--legacy/eet/src/lib/Makefile.am8
-rw-r--r--legacy/eet/src/tests/Makefile.am2
14 files changed, 300 insertions, 394 deletions
diff --git a/legacy/eet/Doxyfile b/legacy/eet/Doxyfile
deleted file mode 100644
index 45f743b37c..0000000000
--- a/legacy/eet/Doxyfile
+++ /dev/null
@@ -1,139 +0,0 @@
1PROJECT_NAME = Eet
2PROJECT_NUMBER =
3OUTPUT_DIRECTORY = doc
4INPUT = eet.c src/lib/Eet.h
5IMAGE_PATH = doc/img
6OUTPUT_LANGUAGE = English
7GENERATE_HTML = YES
8HTML_OUTPUT = html
9HTML_FILE_EXTENSION = .html
10HTML_HEADER = doc/head.html
11HTML_FOOTER = doc/foot.html
12HTML_STYLESHEET = doc/e.css
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
30REPEAT_BRIEF = YES
31ALWAYS_DETAILED_SEC = NO
32INLINE_INHERITED_MEMB = NO
33FULL_PATH_NAMES = NO
34STRIP_FROM_PATH =
35INTERNAL_DOCS = NO
36STRIP_CODE_COMMENTS = YES
37CASE_SENSE_NAMES = YES
38SHORT_NAMES = NO
39HIDE_SCOPE_NAMES = NO
40VERBATIM_HEADERS = NO
41SHOW_INCLUDE_FILES = NO
42JAVADOC_AUTOBRIEF = YES
43MULTILINE_CPP_IS_BRIEF = NO
44DETAILS_AT_TOP = NO
45INHERIT_DOCS = YES
46INLINE_INFO = YES
47SORT_MEMBER_DOCS = YES
48DISTRIBUTE_GROUP_DOC = NO
49TAB_SIZE = 2
50GENERATE_TODOLIST = YES
51GENERATE_TESTLIST = YES
52GENERATE_BUGLIST = YES
53GENERATE_DEPRECATEDLIST= YES
54ALIASES =
55ENABLED_SECTIONS =
56MAX_INITIALIZER_LINES = 30
57OPTIMIZE_OUTPUT_FOR_C = YES
58OPTIMIZE_OUTPUT_JAVA = NO
59SHOW_USED_FILES = NO
60QUIET = NO
61WARNINGS = YES
62WARN_IF_UNDOCUMENTED = YES
63WARN_FORMAT = "$file:$line: $text"
64WARN_LOGFILE =
65FILE_PATTERNS =
66RECURSIVE = NO
67EXCLUDE =
68EXCLUDE_SYMLINKS = NO
69EXCLUDE_PATTERNS =
70EXAMPLE_PATH =
71EXAMPLE_PATTERNS =
72EXAMPLE_RECURSIVE = NO
73INPUT_FILTER =
74FILTER_SOURCE_FILES = NO
75SOURCE_BROWSER = NO
76INLINE_SOURCES = NO
77REFERENCED_BY_RELATION = YES
78REFERENCES_RELATION = YES
79ALPHABETICAL_INDEX = YES
80COLS_IN_ALPHA_INDEX = 2
81IGNORE_PREFIX =
82GENERATE_TREEVIEW = NO
83TREEVIEW_WIDTH = 250
84GENERATE_LATEX = YES
85LATEX_OUTPUT = latex
86LATEX_CMD_NAME = latex
87MAKEINDEX_CMD_NAME = makeindex
88COMPACT_LATEX = NO
89PAPER_TYPE = a4wide
90EXTRA_PACKAGES =
91LATEX_HEADER =
92PDF_HYPERLINKS = YES
93USE_PDFLATEX = NO
94LATEX_BATCHMODE = NO
95GENERATE_RTF = NO
96RTF_OUTPUT = rtf
97COMPACT_RTF = NO
98RTF_HYPERLINKS = NO
99RTF_STYLESHEET_FILE =
100RTF_EXTENSIONS_FILE =
101GENERATE_MAN = YES
102MAN_OUTPUT = man
103MAN_EXTENSION = .3
104MAN_LINKS = YES
105GENERATE_XML = NO
106XML_SCHEMA =
107XML_DTD =
108GENERATE_AUTOGEN_DEF = NO
109ENABLE_PREPROCESSING = YES
110MACRO_EXPANSION = NO
111EXPAND_ONLY_PREDEF = NO
112SEARCH_INCLUDES = NO
113INCLUDE_PATH =
114INCLUDE_FILE_PATTERNS =
115PREDEFINED =
116EXPAND_AS_DEFINED =
117SKIP_FUNCTION_MACROS = YES
118TAGFILES =
119GENERATE_TAGFILE =
120ALLEXTERNALS = NO
121EXTERNAL_GROUPS = YES
122PERL_PATH = /usr/bin/perl
123CLASS_DIAGRAMS = NO
124HIDE_UNDOC_RELATIONS = YES
125HAVE_DOT = NO
126CLASS_GRAPH = NO
127COLLABORATION_GRAPH = NO
128TEMPLATE_RELATIONS = NO
129INCLUDE_GRAPH = NO
130INCLUDED_BY_GRAPH = NO
131GRAPHICAL_HIERARCHY = NO
132DOT_IMAGE_FORMAT = png
133DOT_PATH =
134DOTFILE_DIRS =
135MAX_DOT_GRAPH_WIDTH = 512
136MAX_DOT_GRAPH_HEIGHT = 512
137GENERATE_LEGEND = YES
138DOT_CLEANUP = YES
139SEARCHENGINE = NO
diff --git a/legacy/eet/Makefile.am b/legacy/eet/Makefile.am
index 76993fd1f0..ebc8bce346 100644
--- a/legacy/eet/Makefile.am
+++ b/legacy/eet/Makefile.am
@@ -1,6 +1,6 @@
1ACLOCAL_AMFLAGS = -I m4 1ACLOCAL_AMFLAGS = -I m4
2 2
3SUBDIRS = src 3SUBDIRS = src doc
4 4
5MAINTAINERCLEANFILES = \ 5MAINTAINERCLEANFILES = \
6Makefile.in \ 6Makefile.in \
@@ -26,21 +26,26 @@ AUTHORS \
26COPYING \ 26COPYING \
27COPYING-PLAIN \ 27COPYING-PLAIN \
28autogen.sh \ 28autogen.sh \
29eet.c.in \
30eet.pc.in \ 29eet.pc.in \
31eet.spec.in \ 30eet.spec.in \
32eet.spec \ 31eet.spec \
33README.in \ 32README.in \
34README \ 33README
35Doxyfile \
36doc \
37gendoc
38 34
39pkgconfigdir = $(libdir)/pkgconfig 35pkgconfigdir = $(libdir)/pkgconfig
40pkgconfig_DATA = eet.pc 36pkgconfig_DATA = eet.pc
41 37
38.PHONY: doc coverage
42 39
43if EET_ENABLE_TESTS 40# Documentation
41
42doc:
43 @echo "entering doc/"
44 make -C doc doc
45
46# Unit tests
47
48if EFL_ENABLE_TESTS
44 49
45check-local: 50check-local:
46 @./src/tests/eet_suite 51 @./src/tests/eet_suite
@@ -52,7 +57,9 @@ check-local:
52 57
53endif 58endif
54 59
55if EET_ENABLE_COVERAGE 60# Coverage report
61
62if EFL_ENABLE_COVERAGE
56lcov-reset: 63lcov-reset:
57 @rm -rf coverage 64 @rm -rf coverage
58 @find . -name "*.gcda" -exec rm {} \; 65 @find . -name "*.gcda" -exec rm {} \;
diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac
index debed721de..9e97f234cf 100644
--- a/legacy/eet/configure.ac
+++ b/legacy/eet/configure.ac
@@ -1,9 +1,10 @@
1# get rid of that stupid cache mechanism 1# get rid of that stupid cache mechanism
2rm -f config.cache 2rm -f config.cache
3 3
4AC_INIT(eet, 1.1.0, enlightenment-devel@lists.sourceforge.net) 4AC_INIT([eet], [1.1.0], [enlightenment-devel@lists.sourceforge.net])
5AC_PREREQ(2.52) 5AC_PREREQ([2.52])
6AC_CONFIG_SRCDIR(configure.ac) 6AC_CONFIG_SRCDIR([configure.ac])
7AC_CONFIG_MACRO_DIR([m4])
7AC_CANONICAL_BUILD 8AC_CANONICAL_BUILD
8AC_CANONICAL_HOST 9AC_CANONICAL_HOST
9AC_ISC_POSIX 10AC_ISC_POSIX
@@ -16,6 +17,7 @@ AM_PROG_CC_STDC
16AC_HEADER_STDC 17AC_HEADER_STDC
17AC_C_CONST 18AC_C_CONST
18AM_PROG_CC_C_O 19AM_PROG_CC_C_O
20AC_C___ATTRIBUTE__
19 21
20AC_LIBTOOL_WIN32_DLL 22AC_LIBTOOL_WIN32_DLL
21define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl 23define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
@@ -33,70 +35,54 @@ PKG_PROG_PKG_CONFIG
33 35
34WIN32_CFLAGS="" 36WIN32_CFLAGS=""
35WIN32_LIBS="" 37WIN32_LIBS=""
36lt_no_undefined=""
37lt_enable_auto_import="" 38lt_enable_auto_import=""
38case "$host_os" in 39case "$host_os" in
39 mingw*|cegcc) 40 mingw* | cegcc*)
40 PKG_CHECK_MODULES([EVIL], [evil]) 41 PKG_CHECK_MODULES([EVIL], [evil])
41 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed]) 42 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
42 dnl needed for correct definition of EAPI 43 dnl needed for correct definition of EAPI
43 AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built]) 44 AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built])
44 if test "$host_os" = "cegcc" ; then 45 lt_enable_auto_import="-Wl,--enable-auto-import"
45 WIN32_CFLAGS="-mwin32" 46 ;;
46 WIN32_LIBS="-lws2" 47esac
47 lt_enable_auto_import="-Wl,--enable-auto-import" 48case "$host_os" in
48 else 49 mingw32ce*)
49 WIN32_LIBS="-lws2_32" 50 WIN32_LIBS="-lws2"
50 fi 51 ;;
51 lt_no_undefined="-no-undefined" 52 mingw*)
53 WIN32_LIBS="-lws2_32"
54 ;;
55 cegcc*)
56 WIN32_CFLAGS="-mwin32"
57 WIN32_LIBS="-lws2"
52 ;; 58 ;;
53esac 59esac
54AC_SUBST(WIN32_CFLAGS) 60AC_SUBST(WIN32_CFLAGS)
55AC_SUBST(WIN32_LIBS) 61AC_SUBST(WIN32_LIBS)
56AC_SUBST(lt_no_undefined)
57AC_SUBST(lt_enable_auto_import) 62AC_SUBST(lt_enable_auto_import)
58 63
59dnl Checking for __attribute__ support
60AC_MSG_CHECKING([for __attribute__])
61AC_CACHE_VAL(_cv_have___attribute__,
62 [
63 AC_TRY_COMPILE([#include <stdlib.h>],
64 [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
65 [_cv_have___attribute__="yes"],
66 [_cv_have___attribute__="no"])
67 ]
68)
69
70if test "x${_cv_have___attribute__}" = "xyes" ; then
71 AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__])
72fi
73AC_MSG_RESULT(${_cv_have___attribute__})
74
75AC_FUNC_ALLOCA 64AC_FUNC_ALLOCA
76 65
77AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR("Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")) 66AC_CHECK_HEADER([zlib.h],
78AC_CHECK_HEADER(jpeglib.h,, AC_MSG_ERROR("Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")) 67 [dummy="yes"],
68 [AC_MSG_ERROR("Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")])
69
70AC_CHECK_HEADER([jpeglib.h],
71 [dummy="yes"],
72 [AC_MSG_ERROR("Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")])
79 73
80AC_CHECK_HEADERS(netinet/in.h) 74AC_CHECK_HEADERS(netinet/in.h)
81 75
82AC_CHECK_HEADER(fnmatch.h,, 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])) 76AC_CHECK_HEADER([fnmatch.h],
77 [dummy="yes"],
78 [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])])
83 79
84fnmatch_libs="" 80AC_CHECK_FUNCS([fnmatch], [res="yes"], [res="no"])
85AC_CHECK_FUNCS(fnmatch, res=yes, res=no)
86if test "x$res" = "xno"; then 81if test "x$res" = "xno"; then
87 AC_CHECK_LIB(fnmatch, fnmatch, res=yes fnmatch_libs="-lfnmatch", res=no) 82 AC_SEARCH_LIBS([fnmatch],
88dnl Test for compilation with MinGW. 83 [fnmatch iberty evil])
89dnl fnmatch function is in the libiberty library
90 if test "x$res" = "xno"; then
91 AC_CHECK_LIB(iberty, fnmatch, res=yes fnmatch_libs="-liberty", res=no)
92 fi
93 if test "x$res" = "xno"; then
94 AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch, nor libiberty])
95 fi
96fi 84fi
97 85
98AC_SUBST(fnmatch_libs)
99
100dnl These are needed for fmemopen/open_memstream 86dnl These are needed for fmemopen/open_memstream
101AC_DEFINE(_GNU_SOURCE, , [Enable GNU extensions]) 87AC_DEFINE(_GNU_SOURCE, , [Enable GNU extensions])
102 88
@@ -118,30 +104,8 @@ int main (int argc, char **argv) {
118) 104)
119 105
120dnl Unit Tests 106dnl Unit Tests
121 107EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
122AC_ARG_ENABLE(tests, 108EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"])
123 [AC_HELP_STRING([--enable-tests], [Enable tests @<:@default=no@:>@])],
124 [
125 if test "x${enableval}" = "xyes" ; then
126 enable_tests="yes"
127 else
128 enable_tests="no"
129 fi
130 ],
131 [enable_tests="no"]
132)
133AC_MSG_CHECKING([if tests are built])
134AC_MSG_RESULT([${enable_tests}])
135
136if test "x${enable_tests}" = "xyes" ; then
137 PKG_CHECK_MODULES([CHECK],
138 [check >= 0.9.5],
139 [dummy="yes"],
140 [enable_tests="no"]
141 )
142fi
143
144AM_CONDITIONAL(EET_ENABLE_TESTS, test "x${enable_tests}" = "xyes")
145 109
146dnl Openssl support 110dnl Openssl support
147want_openssl="auto" 111want_openssl="auto"
@@ -155,11 +119,6 @@ if test "x$want_openssl" = "xyes" -o "x$want_openssl" = "xauto"; then
155 [ 119 [
156 have_openssl="yes" 120 have_openssl="yes"
157 AC_DEFINE(HAVE_OPENSSL, 1, [Have Openssl support]) 121 AC_DEFINE(HAVE_OPENSSL, 1, [Have Openssl support])
158 ],
159 [
160 if test "x$use_strict" = "xyes"; then
161 AC_MSG_ERROR([Openssl not found (strict dependencies checking)])
162 fi
163 ]) 122 ])
164fi 123fi
165 124
@@ -169,68 +128,31 @@ have_cypher="no"
169want_signature="yes" 128want_signature="yes"
170have_signature="no" 129have_signature="no"
171 130
172AC_MSG_CHECKING(whether to activate cypher support in eet)
173AC_ARG_ENABLE(cypher, 131AC_ARG_ENABLE(cypher,
174 [AC_HELP_STRING([--disable-cypher], [disable cypher support for eet API])], 132 [AC_HELP_STRING([--disable-cypher], [disable cypher support for eet API])],
175 [ want_cypher=$enableval ] 133 [ want_cypher=$enableval ]
176) 134)
135
177if test "x$have_openssl" = "xyes" -a "x$want_cypher" = "xyes"; then 136if test "x$have_openssl" = "xyes" -a "x$want_cypher" = "xyes"; then
178 have_cypher="yes" 137 have_cypher="yes"
179 AC_DEFINE(HAVE_CYPHER, 1, [Have cypher support built in eet]) 138 AC_DEFINE(HAVE_CYPHER, 1, [Have cypher support built in eet])
180fi 139fi
140
141AC_MSG_CHECKING(whether to activate cypher support in eet)
181AC_MSG_RESULT($have_cypher) 142AC_MSG_RESULT($have_cypher)
182 143
183AC_MSG_CHECKING(whether to activate signature support in eet)
184AC_ARG_ENABLE(signature, 144AC_ARG_ENABLE(signature,
185 [AC_HELP_STRING([--disable-signature], [disable signature file support for eet])], 145 [AC_HELP_STRING([--disable-signature], [disable signature file support for eet])],
186 [ want_signature=$enableval ] 146 [ want_signature=$enableval ]
187) 147)
148
188if test "x$have_openssl" = "xyes" -a "x$want_signature" = "xyes"; then 149if test "x$have_openssl" = "xyes" -a "x$want_signature" = "xyes"; then
189 have_signature="yes" 150 have_signature="yes"
190 AC_DEFINE(HAVE_SIGNATURE, 1, [Have signature support for eet file]) 151 AC_DEFINE(HAVE_SIGNATURE, 1, [Have signature support for eet file])
191fi 152fi
192AC_MSG_RESULT($have_signature)
193
194dnl Coverage
195
196AC_ARG_ENABLE(coverage,
197 [AC_HELP_STRING([--enable-coverage],
198 [compile with coverage profiling instrumentation @<:@default=no@:>@])],
199 [
200 if test "x${enableval}" = "xyes" ; then
201 enable_coverage="yes"
202 else
203 enable_coverage="no"
204 fi],
205 [enable_coverage="no"]
206)
207AC_MSG_CHECKING([whether to use profiling instrumentation])
208AC_MSG_RESULT($enable_coverage)
209
210if test "x$enable_tests" = "xno" -a "x$enable_coverage" = "xyes"; then
211 enable_coverage="no"
212fi
213
214if test "x$enable_coverage" = "xyes"; then
215 AC_CHECK_PROG(have_lcov,
216 [lcov],
217 [yes],
218 [no]
219 )
220 if test "x$have_lcov" = "xyes" ; then
221 COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
222 COVERAGE_LIBS="-lgcov"
223dnl remove any optimisation flag and force debug symbols
224 CFLAGS="-g -O0"
225 else
226 AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
227 enable_coverage="no"
228 fi
229fi
230AC_SUBST(COVERAGE_CFLAGS)
231AC_SUBST(COVERAGE_LIBS)
232 153
233AM_CONDITIONAL(EET_ENABLE_COVERAGE, test "x$enable_coverage" = "xyes") 154AC_MSG_CHECKING(whether to activate signature support in eet)
155AC_MSG_RESULT($have_signature)
234 156
235dnl Disable support for old eet file format. 157dnl Disable support for old eet file format.
236old_eet_file_format="yes" 158old_eet_file_format="yes"
@@ -241,7 +163,6 @@ AC_ARG_ENABLE(old-eet-file-format,
241 ), 163 ),
242 [ old_eet_file_format=$enableval ] 164 [ old_eet_file_format=$enableval ]
243) 165)
244AM_CONDITIONAL(EET_OLD_EET_FILE_FORMAT, test "x$old_eet_file_format" = "xyes")
245if test "x$old_eet_file_format" = "xyes"; then 166if test "x$old_eet_file_format" = "xyes"; then
246 AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format]) 167 AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format])
247else 168else
@@ -257,17 +178,18 @@ AC_ARG_ENABLE(assert,
257 ), 178 ),
258 [ prefer_assert=$enableval ] 179 [ prefer_assert=$enableval ]
259) 180)
260AM_CONDITIONAL(EET_ASSERT, test "x$prefer_assert" = "xyes")
261if test "x$prefer_assert" = "xno"; then 181if test "x$prefer_assert" = "xno"; then
262 cflags="$cflags -DNDEBUG" 182 DEBUG_CFLAGS="-DNDEBUG"
263fi 183fi
184AC_SUBST(DEBUG_CFLAGS)
264 185
265#AM_CHECK_DOXYGEN() 186EFL_CHECK_DOXYGEN([enable_doc="yes"], [enable_doc="no"])
266 187
267AC_OUTPUT([ 188AC_OUTPUT([
268Makefile 189Makefile
269eet.pc 190eet.pc
270eet.c 191doc/Makefile
192doc/eet.c
271src/Makefile 193src/Makefile
272src/lib/Makefile 194src/lib/Makefile
273src/bin/Makefile 195src/bin/Makefile
@@ -292,7 +214,8 @@ echo
292echo " Openssl..............: ${have_openssl}" 214echo " Openssl..............: ${have_openssl}"
293echo " Cypher support.....: ${have_cypher}" 215echo " Cypher support.....: ${have_cypher}"
294echo " Signature..........: ${have_signature}" 216echo " Signature..........: ${have_signature}"
295 217echo
218echo " Documentation........: ${enable_doc}"
296echo " Tests................: ${enable_tests}" 219echo " Tests................: ${enable_tests}"
297echo " Coverage.............: ${enable_coverage}" 220echo " Coverage.............: ${enable_coverage}"
298echo 221echo
diff --git a/legacy/eet/doc/Doxyfile b/legacy/eet/doc/Doxyfile
index b553e4c31f..941fdea839 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.c ../src/lib
5IMAGE_PATH = img 5IMAGE_PATH = img
6OUTPUT_LANGUAGE = English 6OUTPUT_LANGUAGE = English
7GENERATE_HTML = YES 7GENERATE_HTML = YES
@@ -102,7 +102,7 @@ GENERATE_MAN = YES
102MAN_OUTPUT = man 102MAN_OUTPUT = man
103MAN_EXTENSION = .3 103MAN_EXTENSION = .3
104MAN_LINKS = YES 104MAN_LINKS = YES
105GENERATE_XML = YES 105GENERATE_XML = NO
106XML_SCHEMA = 106XML_SCHEMA =
107XML_DTD = 107XML_DTD =
108GENERATE_AUTOGEN_DEF = NO 108GENERATE_AUTOGEN_DEF = NO
diff --git a/legacy/eet/doc/Makefile.am b/legacy/eet/doc/Makefile.am
index 57448493e0..346819a4bc 100644
--- a/legacy/eet/doc/Makefile.am
+++ b/legacy/eet/doc/Makefile.am
@@ -1,46 +1,32 @@
1 1
2if BUILD_DOCS 2MAINTAINERCLEANFILES = Makefile.in eet.c
3
4# install documentation
5docdir = $(datadir)/$(PACKAGE)/doc
6
7all-local: doc-build.stamp
8
9# rule to remove all old created files
10doc-prepare.stamp:
11 @if test -d html ; then \
12 rm -rf html/ latex/ man/ xml/; \
13 fi
14
15# rule to build documentation and copy necessary files
16doc-build.stamp: doc-prepare.stamp
17 @doxygen
18 @cp img/*.png html/
19 3
20# rules to clean 4.PHONY: doc
21clean-local:
22 @rm -rf html/ latex/ man/ xml/
23 5
24# rule to install the documentation in $(docdir) 6if EFL_BUILD_DOC
25install-data-local:
26 @if ! test -d "$(DESTDIR)$(datadir)/$(PACKAGE)"; then \
27 $(mkinstalldirs) "$(DESTDIR)$(datadir)/$(PACKAGE)"; \
28 fi
29 @if ! test -d "$(DESTDIR)$(docdir)"; then \
30 $(mkinstalldirs) "$(DESTDIR)$(docdir)"; \
31 fi
32 @cp -pr html/ man/ latex/ xml/ "$(DESTDIR)$(docdir)"
33 7
34# rule to uninstall the documentation 8doc-clean:
35uninstall-local: 9 rm -rf html/ latex/ man/ xml/ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar*
36 rm -rf $(DESTDIR)$(docdir)
37 10
11doc: all doc-clean
12 $(DOXYGEN)
13 cp img/*.png html/
14 rm -rf $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION).tar*
15 mkdir -p $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION)/doc
16 cp -R html/ latex/ man/ $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION)/doc
17 tar cf $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION).tar $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION)
18 bzip2 -9 $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION).tar
19 rm -rf $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION)
20 mv $(PACKAGE_TARNAME)-doc-$(PACKAGE_VERSION).tar.bz2 $(top_srcdir)
38 21
39MAINTAINERCLEANFILES = Makefile.in eet.c 22else
40 23
41DISTCLEANFILES = Makefile.in eet.c 24doc:
25 @echo "Documentation not built. Run ./configure --help"
42 26
43endif 27endif
44 28
45EXTRA_DIST = Doxyfile eet.css foot.html head.html img/ 29clean-local: doc-clean
30
31EXTRA_DIST = Doxyfile eet.css foot.html head.html img/ eet.c.in
46 32
diff --git a/legacy/eet/eet.c.in b/legacy/eet/doc/eet.c.in
index 3d6c02664b..3d6c02664b 100644
--- a/legacy/eet/eet.c.in
+++ b/legacy/eet/doc/eet.c.in
diff --git a/legacy/eet/gendoc b/legacy/eet/gendoc
deleted file mode 100755
index a308a05299..0000000000
--- a/legacy/eet/gendoc
+++ /dev/null
@@ -1,8 +0,0 @@
1#!/bin/sh
2rm -rf ./doc/html ./doc/latex ./doc/man
3doxygen
4cp doc/img/* doc/html/
5rm -f eet_docs.tar eet_docs.tar.gz
6tar -cvf eet_docs.tar doc/html doc/man doc/latex
7gzip -9 eet_docs.tar
8exit 0
diff --git a/legacy/eet/m4/ac_attribute.m4 b/legacy/eet/m4/ac_attribute.m4
new file mode 100644
index 0000000000..46c1a42291
--- /dev/null
+++ b/legacy/eet/m4/ac_attribute.m4
@@ -0,0 +1,14 @@
1
2AC_DEFUN([AC_C___ATTRIBUTE__],
3[
4 AC_MSG_CHECKING(for __attribute__)
5 AC_CACHE_VAL(ac_cv___attribute__, [
6 AC_TRY_COMPILE([#include <stdlib.h>],
7 [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
8 ac_cv___attribute__=yes, ac_cv___attribute__=no)])
9 if test "$ac_cv___attribute__" = "yes"; then
10 AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__])
11 fi
12 AC_MSG_RESULT($ac_cv___attribute__)
13])
14
diff --git a/legacy/eet/m4/doxygen.m4 b/legacy/eet/m4/doxygen.m4
deleted file mode 100644
index 32c134936a..0000000000
--- a/legacy/eet/m4/doxygen.m4
+++ /dev/null
@@ -1,73 +0,0 @@
1dnl Configure script for doxygen
2dnl Vincent Torri 2005-22-09
3dnl
4dnl AM_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
5dnl Test for the doxygen program, and define BUILD_DOCS and DOXYGEN.
6dnl
7AC_DEFUN([AM_CHECK_DOXYGEN],
8 [
9 DOXYGEN="doxygen"
10 dnl
11 dnl Disable the build of the documentation
12 dnl
13 AC_ARG_ENABLE(
14 [build_docs],
15 AC_HELP_STRING(
16 [--disable-build-docs],
17 [Disable the build of the documentation]),
18 [if test "${disable_build_docs}" = "yes" ; then
19 enable_build_docs="no"
20 else
21 enable_build_docs="yes"
22 fi],
23 [enable_build_docs="yes"])
24 dnl
25 dnl Get the prefix where doxygen is installed.
26 dnl
27 AC_ARG_WITH(
28 [doxygen],
29 AC_HELP_STRING(
30 [--with-doxygen=FILE],
31 [doxygen program to use (eg /usr/bin/doxygen)]),
32 dnl
33 dnl Check the given doxygen program.
34 dnl
35 [DOXYGEN=${withval}
36 AC_CHECK_PROG(
37 [BUILD_DOCS],
38 [${DOXYGEN}],
39 [yes],
40 [no])
41 if test $BUILD_DOCS = no; then
42 echo "WARNING:"
43 echo "The doxygen program you specified:"
44 echo "$DOXYGEN"
45 echo "was not found. Please check the path and make sure "
46 echo "the program exists and is executable."
47 AC_MSG_WARN(
48 [Warning: no doxygen detected. Documentation will not be built])
49 fi],
50 [AC_CHECK_PROG(
51 [BUILD_DOCS],
52 [${DOXYGEN}],
53 [yes],
54 [no])
55 if test ${BUILD_DOCS} = no; then
56 echo "WARNING:"
57 echo "The doxygen program was not found in your execute"
58 echo "You may have doxygen installed somewhere not covered by your path."
59 echo ""
60 echo "If this is the case make sure you have the packages installed, AND"
61 echo "that the doxygen program is in your execute path (see your"
62 echo "shell's manual page on setting the \$PATH environment variable), OR"
63 echo "alternatively, specify the program to use with --with-doxygen."
64 AC_MSG_WARN(
65 [Warning: no doxygen detected. Documentation will not be built])
66 fi])
67 dnl
68 dnl Substitution
69 dnl
70 AC_SUBST([DOXYGEN])
71 AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes")
72 ])
73dnl End of doxygen.m4
diff --git a/legacy/eet/m4/efl_coverage.m4 b/legacy/eet/m4/efl_coverage.m4
new file mode 100644
index 0000000000..1618f76fee
--- /dev/null
+++ b/legacy/eet/m4/efl_coverage.m4
@@ -0,0 +1,64 @@
1dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
2dnl That code is public domain and can be freely used or copied.
3
4dnl Macro that check if coverage support is wanted and, if yes, if
5dnl lcov is available.
6
7dnl Usage: EFL_CHECK_COVERAGE(tests [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
8dnl The parameter 'tests' is used if a dependency is needed. If set to "yes",
9dnl the dependency is available.
10dnl Defines EFL_COVERAGE_CFLAGS and EFL_COVERAGE_LIBS variables
11dnl Defines the automake conditionnal EFL_ENABLE_COVERAGE
12
13AC_DEFUN([EFL_CHECK_COVERAGE],
14[
15
16dnl configure option
17
18AC_ARG_ENABLE([coverage],
19 [AC_HELP_STRING([--enable-coverage], [compile with coverage profiling instrumentation @<:@default=no@:>@])],
20 [
21 if test "x${enableval}" = "xyes" ; then
22 _efl_enable_coverage="yes"
23 else
24 _efl_enable_coverage="no"
25 fi
26 ],
27 [_efl_enable_coverage="no"]
28)
29AC_MSG_CHECKING([whether to use profiling instrumentation])
30AC_MSG_RESULT([$_efl_enable_coverage])
31
32dnl lcov check
33
34if test ! "x$1" = "xyes" -a "x$_efl_enable_coverage" = "xyes" ; then
35 AC_MSG_WARN([Coverage report requested but tests not being built, disable profiling instrumentation.])
36 AC_MSG_WARN([Run configure with --enable-tests])
37 _efl_enable_coverage="no"
38fi
39
40if test "x$_efl_enable_coverage" = "xyes" ; then
41 AC_CHECK_PROG(have_lcov, [lcov], [yes], [no])
42 if test "x$have_lcov" = "xyes" ; then
43 EFL_COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage"
44 EFL_COVERAGE_LIBS="-lgcov"
45# remove any optimisation flag and force debug symbols
46 EFL_DEBUG_CFLAGS="-g -O0 -DDEBUG"
47 else
48 AC_MSG_WARN([lcov is not found, disable profiling instrumentation])
49 _efl_enable_coverage="no"
50 fi
51fi
52
53dnl Substitution
54AC_SUBST(EFL_COVERAGE_CFLAGS)
55AC_SUBST(EFL_COVERAGE_LIBS)
56
57AM_CONDITIONAL(EFL_ENABLE_COVERAGE, test "x${_efl_enable_coverage}" = "xyes")
58
59if test "x${_efl_enable_coverage}" = "xyes" ; then
60 ifelse([$2], , :, [$2])
61else
62 ifelse([$3], , :, [$3])
63fi
64])
diff --git a/legacy/eet/m4/efl_doxygen.m4 b/legacy/eet/m4/efl_doxygen.m4
new file mode 100644
index 0000000000..49a3dfa0c4
--- /dev/null
+++ b/legacy/eet/m4/efl_doxygen.m4
@@ -0,0 +1,88 @@
1dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
2dnl That code is public domain and can be freely used or copied.
3
4dnl Macro that check if doxygen is available or not.
5
6dnl EFL_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
7dnl Test for the doxygen program
8dnl Defines DOXYGEN
9dnl Defines the automake conditionnal EFL_BUILD_DOC
10dnl
11AC_DEFUN([EFL_CHECK_DOXYGEN],
12[
13
14DOXYGEN="doxygen"
15
16dnl
17dnl Disable the build of the documentation
18dnl
19AC_ARG_ENABLE([doc],
20 AC_HELP_STRING(
21 [--disable-doc],
22 [Disable the build of the documentation]),
23 [if test "${disable_doc}" = "yes" ; then
24 enable_doc="no"
25 else
26 enable_doc="yes"
27 fi],
28 [enable_doc="yes"]
29)
30
31dnl
32dnl Specify the full file name, with path
33dnl
34AC_ARG_WITH([doxygen],
35 AC_HELP_STRING(
36 [--with-doxygen=FILE],
37 [doxygen program to use @<:@default=doxygen@:>@]),
38 dnl
39 dnl Check the given doxygen program.
40 dnl
41 [DOXYGEN=${withval}
42 AC_CHECK_PROG([BUILD_DOCS],
43 [${DOXYGEN}],
44 [yes],
45 [no])
46 if test "x${BUILD_DOCS}" = "xno" ; then
47 echo "WARNING:"
48 echo "The doxygen program you specified:"
49 echo "$DOXYGEN"
50 echo "was not found. Please check the path and make sure "
51 echo "the program exists and is executable."
52 AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
53 fi
54 ],
55 [AC_CHECK_PROG([BUILD_DOCS],
56 [${DOXYGEN}],
57 [yes],
58 [no])
59 if test "x${BUILD_DOCS}" = "xno" ; then
60 echo "WARNING:"
61 echo "The doxygen program was not found in your execute"
62 echo "You may have doxygen installed somewhere not covered by your path."
63 echo ""
64 echo "If this is the case make sure you have the packages installed, AND"
65 echo "that the doxygen program is in your execute path (see your"
66 echo "shell manual page on setting the \$PATH environment variable), OR"
67 echo "alternatively, specify the program to use with --with-doxygen."
68 AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built])
69 fi
70 ]
71)
72
73dnl
74dnl Substitution
75dnl
76AC_SUBST([DOXYGEN])
77
78AM_CONDITIONAL(EFL_BUILD_DOC, test "x${BUILD_DOCS}" = "xyes")
79
80if test "x${BUILD_DOCS}" = "xyes" ; then
81 ifelse([$1], , :, [$1])
82else
83 ifelse([$2], , :, [$2])
84fi
85
86])
87
88dnl End of doxygen.m4
diff --git a/legacy/eet/m4/efl_tests.m4 b/legacy/eet/m4/efl_tests.m4
new file mode 100644
index 0000000000..3478b54a16
--- /dev/null
+++ b/legacy/eet/m4/efl_tests.m4
@@ -0,0 +1,44 @@
1dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
2dnl That code is public domain and can be freely used or copied.
3
4dnl Macro that check if tests programs are wanted and if yes, if
5dnl the Check library is available.
6
7dnl Usage: EFL_CHECK_TESTS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
8dnl Define the automake conditionnal EFL_ENABLE_TESTS
9
10AC_DEFUN([EFL_CHECK_TESTS],
11[
12
13dnl configure option
14
15AC_ARG_ENABLE([tests],
16 [AC_HELP_STRING([--enable-tests], [enable tests @<:@default=no@:>@])],
17 [
18 if test "x${enableval}" = "xyes" ; then
19 _efl_enable_tests="yes"
20 else
21 _efl_enable_tests="no"
22 fi
23 ],
24 [_efl_enable_tests="no"]
25)
26AC_MSG_CHECKING([whether tests are built])
27AC_MSG_RESULT([${_efl_enable_tests}])
28
29if test "x${_efl_enable_tests}" = "xyes" ; then
30 PKG_CHECK_MODULES([CHECK],
31 [check >= 0.9.5],
32 [dummy="yes"],
33 [_efl_enable_tests="no"]
34 )
35fi
36
37AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes")
38
39if test "x${_efl_enable_tests}" = "xyes" ; then
40 ifelse([$1], , :, [$1])
41else
42 ifelse([$2], , :, [$2])
43fi
44])
diff --git a/legacy/eet/src/lib/Makefile.am b/legacy/eet/src/lib/Makefile.am
index 838b02739e..09e20df895 100644
--- a/legacy/eet/src/lib/Makefile.am
+++ b/legacy/eet/src/lib/Makefile.am
@@ -4,11 +4,12 @@ MAINTAINERCLEANFILES = Makefile.in
4AM_CPPFLAGS = \ 4AM_CPPFLAGS = \
5-I. \ 5-I. \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_builddir)/src/lib \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 8-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 9-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@EVIL_CFLAGS@ \ 11@EVIL_CFLAGS@ \
11@COVERAGE_CFLAGS@ \ 12@EFL_COVERAGE_CFLAGS@ \
12@OPENSSL_CFLAGS@ 13@OPENSSL_CFLAGS@
13 14
14include_HEADERS = Eet.h 15include_HEADERS = Eet.h
@@ -24,9 +25,8 @@ eet_dictionary.c \
24eet_utils.c 25eet_utils.c
25 26
26libeet_la_CFLAGS = @WIN32_CFLAGS@ 27libeet_la_CFLAGS = @WIN32_CFLAGS@
27libeet_la_LIBADD = @OPENSSL_LIBS@ @COVERAGE_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm 28libeet_la_LIBADD = @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg -lm
28libeet_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ 29libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
29libeet_la_DEPENDENCIES = $(top_builddir)/config.h
30 30
31EXTRA_DIST = Eet_private.h 31EXTRA_DIST = Eet_private.h
32 32
diff --git a/legacy/eet/src/tests/Makefile.am b/legacy/eet/src/tests/Makefile.am
index c39a1fba19..72c766b6e6 100644
--- a/legacy/eet/src/tests/Makefile.am
+++ b/legacy/eet/src/tests/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
5@CHECK_CFLAGS@ 5@CHECK_CFLAGS@
6 6
7 7
8if EET_ENABLE_TESTS 8if EFL_ENABLE_TESTS
9 9
10check_PROGRAMS = eet_suite 10check_PROGRAMS = eet_suite
11 11