summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzmike <michael.blumenkrantz@gmail.com>2014-05-20 11:53:29 -0400
committerzmike <michael.blumenkrantz@gmail.com>2014-05-20 11:53:29 -0400
commit6fb553f619fec379fa861bbf745d2a7bc683b8a4 (patch)
tree6f364bb797b2fa1899470ab74d4546aebfe5225d
parent2f8e015254bc1b65ac5f233b7aa71d64ccb56de2 (diff)
completely redo build system
-rw-r--r--.gitignore8
-rw-r--r--AUTHORS2
-rw-r--r--Makefile.am35
-rw-r--r--NEWS1
-rwxr-xr-xautogen.sh1
-rw-r--r--configure.ac10
-rw-r--r--doc/DoxygenLayout.xml185
-rw-r--r--doc/Makefile.am32
-rw-r--r--doc/Makefile.mk43
-rw-r--r--doc/e.css1027
-rw-r--r--doc/foot.html16
-rw-r--r--doc/head.html72
-rw-r--r--src/Makefile.am3
-rw-r--r--src/lib/Makefile.am29
-rw-r--r--src/lib/Makefile.mk26
-rw-r--r--src/modules/Makefile.am15
-rw-r--r--src/modules/mysql/Makefile.am21
-rw-r--r--src/modules/mysql/Makefile.mk23
-rw-r--r--src/modules/mysql/mysac/Makefile.am32
-rw-r--r--src/modules/mysql/mysac/Makefile.mk37
-rw-r--r--src/modules/postgresql/Makefile.am18
-rw-r--r--src/modules/postgresql/Makefile.mk19
-rw-r--r--src/modules/sqlite/Makefile.am18
-rw-r--r--src/modules/sqlite/Makefile.mk19
-rw-r--r--src/tests/Makefile.am25
-rw-r--r--src/tests/Makefile.mk18
26 files changed, 1262 insertions, 473 deletions
diff --git a/.gitignore b/.gitignore
index 86b1022..94c9b51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,11 +16,7 @@ esskyuehl.pc
16install-sh 16install-sh
17libtool 17libtool
18ltmain.sh 18ltmain.sh
19m4/libtool.m4 19m4/l*
20m4/ltoptions.m4
21m4/ltsugar.m4
22m4/ltversion.m4
23m4/lt~obsolete.m4
24missing 20missing
25stamp-h1 21stamp-h1
26basic_pool 22basic_pool
@@ -30,3 +26,5 @@ esskyuehl-*.bz2
30test.db 26test.db
31test_sqlite 27test_sqlite
32ar-lib 28ar-lib
29INSTALL
30.dirstamp
diff --git a/AUTHORS b/AUTHORS
index 892aa34..1c14e16 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,3 @@
1Mike Blumenkrantz (zmike/discomfitor) michael.blumenkrantz@gmail.com 1Mike Blumenkrantz (zmike/discomfitor) <zmike@enlightenment.org>
2Gustavo Sverzut Barbieri <barbieri@profusion.mobi> 2Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
3Guillaume Friloux <guillaume.friloux@gmail.com> 3Guillaume Friloux <guillaume.friloux@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 3f3c951..e6ab1f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
1ACLOCAL_AMFLAGS = -I m4 1ACLOCAL_AMFLAGS = -I m4
2 2AUTOMAKE_OPTIONS = subdir-objects
3SUBDIRS = src doc
4 3
5MAINTAINERCLEANFILES = \ 4MAINTAINERCLEANFILES = \
5ar-lib \
6Makefile.in \ 6Makefile.in \
7aclocal.m4 \ 7aclocal.m4 \
8compile \ 8compile \
@@ -19,6 +19,11 @@ missing \
19esskyuehl*doc*tar* \ 19esskyuehl*doc*tar* \
20m4/l* 20m4/l*
21 21
22CLEANFILES = \
23$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
24$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \
25$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2
26
22pkgconfigdir = $(libdir)/pkgconfig 27pkgconfigdir = $(libdir)/pkgconfig
23pkgconfig_DATA = esskyuehl.pc 28pkgconfig_DATA = esskyuehl.pc
24 29
@@ -29,12 +34,32 @@ README \
29$(pkgconfig_DATA) \ 34$(pkgconfig_DATA) \
30autogen.sh \ 35autogen.sh \
31esskyuehl.pc.in \ 36esskyuehl.pc.in \
37m4/efl.m4 \
38m4/efl_compiler_flag.m4 \
32m4/efl_doxygen.m4 39m4/efl_doxygen.m4
33 40
41moddir = $(libdir)/esskyuehl/$(MODULE_ARCH)
42mod_LTLIBRARIES =
43
44MOD_CFLAGS = \
45-I$(top_builddir) \
46@EFL_CFLAGS@ \
47-I$(top_srcdir)/src/lib
48
49MOD_LIBS = \
50$(top_builddir)/src/lib/libesskyuehl.la \
51@EFL_LIBS@
52
53LD_FLAGS = -no-undefined -module -avoid-version
54LT_FLAGS = --tag=disable-static
55
34.PHONY: doc 56.PHONY: doc
35 57
36# Documentation 58# Documentation
37 59
38doc: all 60include doc/Makefile.mk
39 @echo "entering doc/" 61include src/lib/Makefile.mk
40 $(MAKE) -C doc doc 62include src/modules/mysql/Makefile.mk
63include src/modules/postgresql/Makefile.mk
64include src/modules/sqlite/Makefile.mk
65include src/tests/Makefile.mk
diff --git a/NEWS b/NEWS
index e69de29..7d1f011 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1 @@
1.0 Release!
diff --git a/autogen.sh b/autogen.sh
index 60082b0..cc237a6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2cwd="$PWD" 2cwd="$PWD"
3bs_dir="$(dirname $(readlink -f $0))" 3bs_dir="$(dirname $(readlink -f $0))"
4rm -rf "${bs_dir}"/autom4te.cache
5rm -f "${bs_dir}"/aclocal.m4 "${bs_dir}"/ltmain.sh 4rm -f "${bs_dir}"/aclocal.m4 "${bs_dir}"/ltmain.sh
6 5
7echo 'Running autoreconf -if...' 6echo 'Running autoreconf -if...'
diff --git a/configure.ac b/configure.ac
index 0c4d82d..678ab16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,16 +153,6 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
153 153
154AC_OUTPUT([ 154AC_OUTPUT([
155Makefile 155Makefile
156doc/esskyuehl.dox
157doc/Makefile
158src/Makefile
159src/lib/Makefile
160src/modules/Makefile
161src/modules/postgresql/Makefile
162src/modules/sqlite/Makefile
163src/modules/mysql/Makefile
164src/modules/mysql/mysac/Makefile
165src/tests/Makefile
166esskyuehl.pc 156esskyuehl.pc
167]) 157])
168 158
diff --git a/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml
new file mode 100644
index 0000000..e564a40
--- /dev/null
+++ b/doc/DoxygenLayout.xml
@@ -0,0 +1,185 @@
1<doxygenlayout version="1.0">
2 <!-- Navigation index tabs for HTML output -->
3 <navindex>
4 <tab type="mainpage" visible="yes" title=""/>
5 <tab type="pages" visible="yes" title="" intro=""/>
6 <tab type="modules" visible="no" title="" intro=""/>
7 <tab type="namespaces" visible="yes" title="">
8 <tab type="namespaces" visible="yes" title="" intro=""/>
9 <tab type="namespacemembers" visible="yes" title="" intro=""/>
10 </tab>
11 <tab type="classes" visible="yes" title="">
12 <tab type="classes" visible="yes" title="" intro=""/>
13 <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
14 <tab type="hierarchy" visible="yes" title="" intro=""/>
15 <tab type="classmembers" visible="yes" title="" intro=""/>
16 </tab>
17 <tab type="files" visible="yes" title="">
18 <tab type="files" visible="yes" title="" intro=""/>
19 <tab type="globals" visible="yes" title="" intro=""/>
20 </tab>
21 <tab type="dirs" visible="yes" title="" intro=""/>
22 <tab type="examples" visible="yes" title="" intro=""/>
23 </navindex>
24
25 <!-- Layout definition for a class page -->
26 <class>
27 <briefdescription visible="yes"/>
28 <includes visible="$SHOW_INCLUDE_FILES"/>
29 <inheritancegraph visible="$CLASS_GRAPH"/>
30 <collaborationgraph visible="$COLLABORATION_GRAPH"/>
31 <allmemberslink visible="yes"/>
32 <memberdecl>
33 <nestedclasses visible="yes" title=""/>
34 <publictypes title=""/>
35 <publicslots title=""/>
36 <signals title=""/>
37 <publicmethods title=""/>
38 <publicstaticmethods title=""/>
39 <publicattributes title=""/>
40 <publicstaticattributes title=""/>
41 <protectedtypes title=""/>
42 <protectedslots title=""/>
43 <protectedmethods title=""/>
44 <protectedstaticmethods title=""/>
45 <protectedattributes title=""/>
46 <protectedstaticattributes title=""/>
47 <packagetypes title=""/>
48 <packagemethods title=""/>
49 <packagestaticmethods title=""/>
50 <packageattributes title=""/>
51 <packagestaticattributes title=""/>
52 <properties title=""/>
53 <events title=""/>
54 <privatetypes title=""/>
55 <privateslots title=""/>
56 <privatemethods title=""/>
57 <privatestaticmethods title=""/>
58 <privateattributes title=""/>
59 <privatestaticattributes title=""/>
60 <friends title=""/>
61 <related title="" subtitle=""/>
62 <membergroups visible="yes"/>
63 </memberdecl>
64 <detaileddescription title=""/>
65 <memberdef>
66 <typedefs title=""/>
67 <enums title=""/>
68 <constructors title=""/>
69 <functions title=""/>
70 <related title=""/>
71 <variables title=""/>
72 <properties title=""/>
73 <events title=""/>
74 </memberdef>
75 <usedfiles visible="$SHOW_USED_FILES"/>
76 <authorsection visible="yes"/>
77 </class>
78
79 <!-- Layout definition for a namespace page -->
80 <namespace>
81 <briefdescription visible="yes"/>
82 <memberdecl>
83 <nestednamespaces visible="yes" title=""/>
84 <classes visible="yes" title=""/>
85 <typedefs title=""/>
86 <enums title=""/>
87 <functions title=""/>
88 <variables title=""/>
89 <membergroups visible="yes"/>
90 </memberdecl>
91 <detaileddescription title=""/>
92 <memberdef>
93 <typedefs title=""/>
94 <enums title=""/>
95 <functions title=""/>
96 <variables title=""/>
97 </memberdef>
98 <authorsection visible="yes"/>
99 </namespace>
100
101 <!-- Layout definition for a file page -->
102 <file>
103 <briefdescription visible="yes"/>
104 <includes visible="$SHOW_INCLUDE_FILES"/>
105 <includegraph visible="$INCLUDE_GRAPH"/>
106 <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
107 <sourcelink visible="yes"/>
108 <memberdecl>
109 <classes visible="yes" title=""/>
110 <namespaces visible="yes" title=""/>
111 <defines title=""/>
112 <typedefs title=""/>
113 <enums title=""/>
114 <functions title=""/>
115 <variables title=""/>
116 <membergroups visible="yes"/>
117 </memberdecl>
118 <detaileddescription title=""/>
119 <memberdef>
120 <defines title=""/>
121 <typedefs title=""/>
122 <enums title=""/>
123 <functions title=""/>
124 <variables title=""/>
125 </memberdef>
126 <authorsection/>
127 </file>
128
129 <!-- Layout definition for a group page -->
130 <group>
131 <briefdescription visible="yes"/>
132 <groupgraph visible="$GROUP_GRAPHS"/>
133 <memberdecl>
134 <classes visible="yes" title=""/>
135 <namespaces visible="yes" title=""/>
136 <dirs visible="yes" title=""/>
137 <nestedgroups visible="yes" title=""/>
138 <files visible="yes" title=""/>
139 <defines title=""/>
140 <typedefs title=""/>
141 <enums title=""/>
142 <enumvalues title=""/>
143 <functions title=""/>
144 <variables title=""/>
145 <signals title=""/>
146 <publicslots title=""/>
147 <protectedslots title=""/>
148 <privateslots title=""/>
149 <events title=""/>
150 <properties title=""/>
151 <friends title=""/>
152 <membergroups visible="yes"/>
153 </memberdecl>
154 <detaileddescription title=""/>
155 <memberdef>
156 <pagedocs/>
157 <inlineclasses title=""/>
158 <defines title=""/>
159 <typedefs title=""/>
160 <enums title=""/>
161 <enumvalues title=""/>
162 <functions title=""/>
163 <variables title=""/>
164 <signals title=""/>
165 <publicslots title=""/>
166 <protectedslots title=""/>
167 <privateslots title=""/>
168 <events title=""/>
169 <properties title=""/>
170 <friends title=""/>
171 </memberdef>
172 <authorsection visible="yes"/>
173 </group>
174
175 <!-- Layout definition for a directory page -->
176 <directory>
177 <briefdescription visible="yes"/>
178 <directorygraph visible="yes"/>
179 <memberdecl>
180 <dirs visible="yes"/>
181 <files visible="yes"/>
182 </memberdecl>
183 <detaileddescription title=""/>
184 </directory>
185</doxygenlayout>
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 0fbf775..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in esskyuehl.dox
2
3.PHONY: doc
4
5PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
6
7if EFL_BUILD_DOC
8
9doc-clean:
10 rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
11
12doc: all doc-clean
13 $(efl_doxygen)
14 cp img/* html/
15 rm -rf $(PACKAGE_DOCNAME).tar*
16 mkdir -p $(PACKAGE_DOCNAME)/doc
17 cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
18 tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
19 bzip2 -9 $(PACKAGE_DOCNAME).tar
20 rm -rf $(PACKAGE_DOCNAME)/
21 mv $(PACKAGE_DOCNAME).tar.bz2 $(top_srcdir)
22
23clean-local: doc-clean
24
25else
26
27doc:
28 @echo "Documentation not built. Run ./configure --help"
29
30endif
31
32EXTRA_DIST = Doxyfile $(wildcard img/*.*) e.css head.html foot.html esskyuehl.dox.in
diff --git a/doc/Makefile.mk b/doc/Makefile.mk
new file mode 100644
index 0000000..d8d0c01
--- /dev/null
+++ b/doc/Makefile.mk
@@ -0,0 +1,43 @@
1MAINTAINERCLEANFILES += doc/esskyuehl.dox
2
3PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
4
5if EFL_BUILD_DOC
6
7doc-clean:
8 rm -rf doc/html/ doc/latex/ doc/man/ doc/xml/ doc/$(PACKAGE_DOCNAME).tar*
9
10doc: all doc-clean
11 $(efl_doxygen)
12 cp doc/img/* doc/html/
13 rm -rf doc/$(PACKAGE_DOCNAME).tar*
14 mkdir -p doc/$(PACKAGE_DOCNAME)/doc
15 cp -R doc/html/ doc/latex/ doc/man/ doc/$(PACKAGE_DOCNAME)/doc
16 tar cf doc/$(PACKAGE_DOCNAME).tar doc/$(PACKAGE_DOCNAME)/
17 bzip2 -9 doc/$(PACKAGE_DOCNAME).tar
18 rm -rf doc/$(PACKAGE_DOCNAME)/
19 mv doc/$(PACKAGE_DOCNAME).tar.bz2 $(top_srcdir)
20
21clean-local: doc-clean
22
23else
24
25doc:
26 @echo "Documentation not built. Run ./configure --help"
27
28endif
29
30EXTRA_DIST += \
31doc/Doxyfile.in \
32doc/img/edoxy.css \
33doc/img/header_menu_current_background.png \
34doc/img/foot_bg.png \
35doc/img/header_menu_unselected_background.png \
36doc/img/header_menu_background_last.png \
37doc/img/head_bg.png \
38doc/img/logo.png \
39doc/img/header_menu_background.png \
40doc/e.css \
41doc/head.html \
42doc/foot.html \
43doc/esskyuehl.dox.in
diff --git a/doc/e.css b/doc/e.css
index 2dd6b44..e49a267 100644
--- a/doc/e.css
+++ b/doc/e.css
@@ -1,273 +1,942 @@
1body, table, div, p, dl {
2 font-family: sans-serif;
3 font-size: 9pt;
4}
5
6body {
7 background-color: #404040;
8 color: black;
9 margin: 0;
10}
11
12h1 {
13 font-size: 150%;
14}
15
16h2 {
17 font-size: 120%;
18}
19
20h3 {
21 font-size: 100%;
22}
23
24dt {
25 font-weight: bold;
26}
27
28div.multicol {
29 -moz-column-gap: 1em;
30 -webkit-column-gap: 1em;
31 -moz-column-count: 3;
32 -webkit-column-count: 3;
33}
34
35p.startli, p.startdd, p.starttd {
36 margin-top: 2px;
37}
38
39p.endli {
40 margin-bottom: 0px;
41}
42
43p.enddd {
44 margin-bottom: 4px;
45}
46
47p.endtd {
48 margin-bottom: 2px;
49}
50
51caption {
52 font-weight: bold;
53}
54
55span.legend {
56 font-size: 70%;
57 text-align: center;
58}
59
60h3.version {
61 font-size: 90%;
62 text-align: center;
63}
64
65div.navtab {
66 background-color: #606060;
67 border: 1px solid #303030;
68 text-align: center;
69}
70
71div.qindex {
72 background-color: #eeeeee;
73 text-align: center;
74 margin-left: auto;
75 margin-right: auto;
76 height: 18px;
77 overflow: hidden;
78 vertical-align: middle;
79}
80
81div.navpath {
82 width: 980px;
83 background-color: #606060;
84 text-align: center;
85 margin-left: auto;
86 margin-right: auto;
87 box-shadow: 0px 3px 5px #000000;
88 height: 18px;
89 overflow: hidden;
90 vertical-align: middle;
91}
92
93div.navtab {
94 margin-right: 15px;
95}
96
97a {
98 color: #3399ff;
99 font-weight: normal;
100 text-decoration: none;
101}
102
103.contents a:visited {
104 color: #2277aa;
105}
106
107a:hover {
108 text-decoration: underline;
109}
110
111a.qindex {
112 font-weight: bold;
113}
114
115a.qindexHL {
116 font-weight: bold;
117 background-color: #9CAFD4;
118 color: #ffffff;
119 border: 1px double #869DCA;
120}
121
122.contents a.qindexHL:visited {
123 color: #ffffff;
124}
125
126a.el {
127 font-weight: bold;
128}
129
130a.elRef {
131}
132
133a.code, a.code:visited {
134 color: #4665A2;
135}
136
137a.codeRef, a.codeRef:visited {
138 color: #4665A2;
139}
140
141dl.el {
142 margin-left: -1cm;
143}
144
145.fragment {
146 font-family: monospace, mono, fixed;
147 font-size: 9pt;
148 white-space: pre;
149}
150
151.line {
152 font-family: monospace, mono, fixed;
153 font-size: 9pt;
154 line-height: 0%;
155}
156
157pre.fragment {
158 border: 1px solid #cccccc;
159 background-color: #eeeeee;
160 padding: 4px 6px;
161 margin: 4px 8px 4px 2px;
162 overflow: auto;
163 font-size: 9pt;
164}
165
166div.ah {
167 background-color: #000000;
168 font-weight: bold;
169 color: #ffffff;
170 margin-bottom: 3px;
171 margin-top: 3px;
172 padding: 0.2em;
173}
174
175div.groupHeader {
176 margin-left: 16px;
177 margin-top: 12px;
178 font-weight: bold;
179}
180
181div.groupText {
182 margin-left: 16px;
183 font-style: italic;
184}
185
186td.indexkey {
187 background-color: #eeeeee;
188 font-weight: bold;
189 border: 1px solid #dddddd;
190 margin: 2px 0px 2px 0;
191 padding: 2px 10px;
192 white-space: nowrap;
193 vertical-align: top;
194}
195
196td.indexvalue {
197 background-color: #eeeeee;
198 border: 1px solid #dddddd;
199 padding: 2px 10px;
200 margin: 2px 0px;
201}
202
203tr.memlist {
204 background-color: #EEF1F7;
205}
206
207p.formulaDsp {
208 text-align: center;
209}
210
211img.formulaDsp {
212}
213
214img.formulaInl {
215 vertical-align: middle;
216}
217
218div.center {
219 text-align: center;
220 margin-top: 0px;
221 margin-bottom: 0px;
222 padding: 0px;
223}
224
225div.center img {
226 border: 0px;
227}
228
229address.footer {
230 text-align: right;
231 padding-right: 12px;
232}
233
234img.footer {
235 border: 0px;
236 vertical-align: middle;
237}
238
239span.keyword {
240 color: #008000
241}
242
243span.keywordtype {
244 color: #604020
245}
246
247span.keywordflow {
248 color: #e08000
249}
250
251span.comment {
252 color: #800000
253}
254
255span.preprocessor {
256 color: #806020
257}
258
259span.stringliteral {
260 color: #002080
261}
262
263span.charliteral {
264 color: #008080
265}
266
267span.vhdldigit {
268 color: #ff00ff
269}
270
271span.vhdlchar {
272 color: #000000
273}
274
275span.vhdlkeyword {
276 color: #700070
277}
278
279span.vhdllogic {
280 color: #ff0000
281}
282
1/* 283/*
2 Author: 284.search {
3 Andres Blanc <andresblanc@gmail.com> 285 color: #003399;
4 DaveMDS Andreoli <dave@gurumeditation.it> 286 font-weight: bold;
287}
5 288
6 Supported Browsers: 289form.search {
7 ie7, opera9, konqueror4 and firefox3 290 margin-bottom: 0px;
291 margin-top: 0px;
292}
8 293
9 Please use a different file for ie6, ie5, etc. hacks. 294input.search {
295 font-size: 75%;
296 color: #000080;
297 font-weight: normal;
298 background-color: #e8eef2;
299}
10*/ 300*/
11 301
302td.tiny {
303 font-size: 75%;
304}
12 305
13/* Necessary to place the footer at the bottom of the page */ 306.dirtab {
14html, body { 307 padding: 4px;
15 height: 100%; 308 border-collapse: collapse;
16 margin: 0px; 309 border: 1px solid #A3B4D7;
17 padding: 0px;
18} 310}
19 311
20#container { 312th.dirtab {
21 min-height: 100%; 313 background: #EBEFF6;
22 height: auto !important; 314 font-weight: bold;
23 height: 100%;
24 margin: 0 auto -53px;
25} 315}
26 316
27#footer, #push { 317hr {
28 height: 53px; 318 height: 0px;
319 border: none;
320 border-top: 1px solid #c9c6e6;;
29} 321}
30 322
323hr.footer {
324 height: 1px;
325}
31 326
32* html #container { 327table.memberdecls {
33 height: 100%; 328 border-spacing: 0px;
329 padding: 0px;
34} 330}
35 331
36/* Prevent floating elements overflowing containers */ 332.mdescLeft, .mdescRight,
37.clear { 333.memItemLeft, .memItemRight,
38 clear: both; 334.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
39 width: 0px; 335 background-color: #eeeeee;
40 height: 0px; 336 border: none;
337 margin: 4px;
338 padding: 1px 0 0 8px;
41} 339}
42 340
43/* Flexible & centered layout from 750 to 960 pixels */ 341.mdescLeft, .mdescRight {
44.layout { 342 padding: 0px 8px 4px 8px;
45 max-width: 960px; 343 color: #555555;
46 min-width: 760px;
47 margin-left: auto;
48 margin-right: auto;
49} 344}
50 345
51body { 346.memItemLeft, .memItemRight, .memTemplParams {
52 /*font-family: Lucida Grande, Helvetica, sans-serif;*/ 347 border-top: 1px solid #dddddd;
53 font-family: "Bitstream Vera","Vera","Trebuchet MS",Trebuchet,Tahoma,sans-serif
54} 348}
55 349
56/* Prevent design overflowing the viewport in small resolutions */ 350.memItemLeft, .memTemplItemLeft {
57#container { 351 white-space: nowrap;
58 padding-right: 17px;
59 padding-left: 17px;
60 background-image: url(head_bg.png);
61 background-repeat: repeat-x;
62} 352}
63 353
64/****************************/ 354.memItemRight {
65/* Top main menu */ 355 width: 100%;
66/****************************/
67#header_logo {
68 background-image : url(logo.png);
69 width : 61px;
70} 356}
71 357
72#header_logo a { 358.memTemplParams {
73 position : absolute; 359 color: #4665A2;
74 border : 0px; 360 white-space: nowrap;
75 background-color : transparent;
76 top : 0px;
77 width : 60px;
78 height : 60px;
79} 361}
80 362
81#header_menu { 363.memtemplate {
82 background-image : url(header_menu_background.png); 364 font-size: 80%;
83 font : normal 10pt verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif; 365 color: #4665A2;
84 text-align : right; 366 font-weight: normal;
367 margin-left: 9px;
85} 368}
86 369
87#header_last { 370.memnav {
88 background-image : url(header_menu_background_last.png); 371 background-color: #EBEFF6;
89 width : 15px; 372 border: 1px solid #A3B4D7;
373 text-align: center;
374 margin: 2px;
375 margin-right: 15px;
376 padding: 2px;
90} 377}
91 378
92td.nav_passive { 379.mempage {
93 background : url(header_menu_unselected_background.png) 0 0 no-repeat; 380 width: 100%;
94 height : 63px;
95 font-family : "Bitstream Vera","Vera","Trebuchet MS",Trebuchet,Tahoma,sans-serif;
96 font-size : 11px;
97 padding : 20px 10px 20px 10px;
98 vertical-align : middle;
99} 381}
100 382
101td.nav_active { 383.memitem {
102 background : url(header_menu_current_background.png) 0 0 no-repeat; 384 padding: 0;
103 height : 63px; 385 margin-bottom: 10px;
104 color : #646464; 386 margin-right: 5px;
105 font-family : "Bitstream Vera","Vera","Trebuchet MS",Trebuchet,Tahoma,sans-serif;
106 font-size : 11px;
107 font-weight : bold;
108 padding : 20px 10px 20px 10px;
109 vertical-align : middle;
110} 387}
111 388
112#header_menu a { 389.memname {
113 display : block; 390 white-space: nowrap;
114 text-decoration : none; 391 font-weight: bold;
115 cursor : pointer; 392 margin-left: 6px;
116 color : #cdcdcd;
117} 393}
118 394
395.memproto, dl.reflist dt {
396 border-top: 1px solid #aaaaaa;
397 border-left: 1px solid #aaaaaa;
398 border-right: 1px solid #aaaaaa;
399 padding: 6px 0px 6px 0px;
400 color: #202020;
401 font-weight: bold;
402 text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5);
403 box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
404 -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
405 -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
406 background-color: #eeeeee;
407}
119 408
409.memdoc, dl.reflist dd {
410 border-bottom: 1px solid #aaaaaa;
411 border-left: 1px solid #aaaaaa;
412 border-right: 1px solid #aaaaaa;
413 padding: 2px 5px;
414 background-color: #eeeeee;
415 border-top-width: 0;
416 box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
417 -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
418 -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
419 background-color: #ffffff;
420}
120 421
121#header { 422dl.reflist dt {
122 width: 100%; 423 padding: 5px;
123 height: 102px;
124} 424}
125 425
126#header h1 { 426dl.reflist dd {
127 width: 63px; 427 margin: 0px 0px 10px 0px;
128 height: 63px; 428 padding: 5px;
129 position: absolute;
130 margin: 0px;
131} 429}
132 430
133#header h1 span { 431.paramkey {
134 display: none; 432 text-align: right;
135} 433}
136 434
137#header h2 { 435.paramtype {
138 display: none; 436 white-space: nowrap;
139} 437}
140 438
141/* .menu-container is used to set properties common to .menu and .submenu */ 439.paramname {
142#header .menu-container { 440 color: #602020;
441 white-space: nowrap;
442}
443.paramname em {
444 font-style: normal;
143} 445}
144 446
145#header .menu-container ul { 447.params, .retval, .exception, .tparams {
146 list-style-type: none; 448 border-spacing: 6px 2px;
147 list-style-position: inside;
148 margin: 0;
149} 449}
150 450
151#header .menu-container li { 451.params .paramname, .retval .paramname {
152 display: block; 452 font-weight: bold;
153 float: right; 453 vertical-align: top;
154} 454}
155 455
156#header .menu { 456.params .paramtype {
157 height: 63px; 457 font-style: italic;
158 display: block; 458 vertical-align: top;
159 background-image: url(menu_bg.png);
160 background-repeat: repeat-x;
161} 459}
162 460
163#header .menu ul { 461.params .paramdir {
164 height: 100%; 462 font-family: mono, monospace, fixed;
165 display: block; 463 vertical-align: top;
166 background-image: url(menu_bg_last.png);
167 background-repeat: no-repeat;
168 background-position: top right;
169 padding-right: 17px;
170} 464}
171 465
172#header .menu li { 466.ftvtree {
173 height: 100%; 467 font-family: sans-serif;
174 text-align: center; 468 margin: 0px;
175 background-image: url(menu_bg_unsel.png);
176 background-repeat: no-repeat;
177} 469}
178 470
179#header .menu a { 471.directory {
180 height: 100%; 472 font-size: 9pt;
181 display: block; 473 font-weight: bold;
182 color: #cdcdcd; 474 margin: 5px;
183 text-decoration: none;
184 font-size: 10pt;
185 line-height: 59px;
186 text-align: center;
187 padding: 0px 15px 0px 15px;
188} 475}
189 476
190#header .menu li:hover { 477.directory h3 {
191 background-image: url(menu_bg_hover.png); 478 margin: 0px;
192 background-repeat: no-repeat; 479 margin-top: 1em;
480 font-size: 11pt;
193} 481}
194 482
195#header .menu li:hover a { 483/*
196 color: #FFFFFF; 484.directory h3.swap {
485 height: 61px;
486 background-repeat: no-repeat;
487 background-image: url("yourimage.gif");
488}
489.directory h3.swap span {
490 display: none;
491}
492*/
493
494.directory > h3 {
495 margin-top: 0;
496}
497
498.directory p {
499 margin: 0px;
500 white-space: nowrap;
501}
502
503.directory div {
504 display: none;
505 margin: 0px;
506}
507
508.directory img {
509 vertical-align: -30%;
510}
511
512.directory tr.even {
513 background-color: #f2f2f2;
514}
515
516.directory tr {
517 background-color: #ffffff;
197} 518}
198 519
199#header .menu li.current { 520.directory td.entry {
200 background-image: url(menu_bg_current.png); 521 width: 400px;
201 background-repeat: no-repeat;
202} 522}
203 523
204#header .menu li.current a { 524.directory-alt {
205 color: #646464; 525 font-size: 100%;
526 font-weight: bold;
206} 527}
207 528
529.directory-alt h3 {
530 margin: 0px;
531 margin-top: 1em;
532 font-size: 11pt;
533}
208 534
209/* Hide all the submenus but the current */ 535.directory-alt > h3 {
210#header .submenu ul { 536 margin-top: 0;
211 display: none;
212} 537}
213 538
214#header .submenu .current { 539.directory-alt p {
215 display: block; 540 margin: 0px;
541 white-space: nowrap;
216} 542}
217 543
218#header .submenu { 544.directory-alt div {
219 font: bold 10px verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif; 545 display: none;
220 margin-top: 10px; 546 margin: 0px;
221} 547}
222 548
223#header .submenu a { 549.directory-alt img {
224 color: #888888; 550 vertical-align: -30%;
225 text-decoration: none;
226 font-size: 0.9em;
227 line-height: 15px;
228 padding:0px 5px 0px 5px;
229} 551}
230 552
231#header .submenu a:hover { 553div.dynheader {
232 color: #444444; 554 margin-top: 8px;
233} 555}
234 556
235#header .submenu li { 557address {
236 border-left: 1px solid #DDDDDD; 558 font-style: normal;
559 color: #2A3D61;
237} 560}
238 561
239#header .submenu li:last-child { 562table.doxtable {
240 border-left: 0; 563 border-collapse:collapse;
241} 564}
242 565
243#header .doxytitle { 566table.doxtable td, table.doxtable th {
244 position: absolute; 567 border: 1px solid #2D4068;
245 font-size: 1.8em; 568 padding: 3px 7px 2px;
246 font-weight: bold;
247 color: #444444;
248 line-height: 35px;
249} 569}
250 570
251#header small { 571table.doxtable th {
252 font-size: 0.4em; 572 background-color: #374F7F;
573 color: #FFFFFF;
574 font-size: 110%;
575 padding-bottom: 4px;
576 padding-top: 5px;
577 text-align:left;
253} 578}
254 579
255#footer { 580table.fieldtable {
256 background-image: url(foot_bg.png); 581 width: 100%;
257 width: 100%; 582 margin-bottom: 10px;
583 border: 1px solid #aaaaaa;
584 border-spacing: 0px;
585 -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
586 -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
587 box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
258} 588}
259 589
260#footer table { 590.fieldtable td, .fieldtable th {
261 width: 100%; 591 padding: 3px 7px 2px;
262 text-align: center;
263 white-space: nowrap;
264 padding: 5px 30px 5px 30px;
265 font-size: 0.8em;
266 font-family: "Bitstream Vera","Vera","Trebuchet MS",Trebuchet,Tahoma,sans-serif;
267 color: #888888;
268} 592}
269 593
270#footer td.copyright { 594.fieldtable td.fieldtype, .fieldtable td.fieldname {
271 width: 100%; 595 white-space: nowrap;
596 border-right: 1px solid #aaaaaa;
597 border-bottom: 1px solid #aaaaaa;
598 vertical-align: top;
272} 599}
273 600
601.fieldtable td.fielddoc {
602 border-bottom: 1px solid #aaaaaa;
603 width: 100%;
604}
605
606.fieldtable tr:last-child td {
607 border-bottom: none;
608}
609
610.fieldtable th {
611 background-color: #dddddd;
612 color: #202020;
613 padding-bottom: 4px;
614 padding-top: 5px;
615 text-align:left;
616 border-bottom: 1px solid #aaaaaa;
617}
618
619.tabsearch {
620 top: 0px;
621 left: 10px;
622 height: 36px;
623 background-image: url('tab_b.png');
624 z-index: 101;
625 overflow: hidden;
626 font-size: 13px;
627}
628
629.navpath ul {
630 font-size: 9pt;
631 height: 18px;
632 color: #ffffff;
633 overflow: hidden;
634 margin: 0px;
635 padding: 0px;
636 vertical-align: middle;
637}
638
639.navpath li {
640 list-style-type: none;
641 float: left;
642 padding-left: 10px;
643 padding-right: 10px;
644 border-right: 4px solid #3399ff;
645 vertical-align: middle;
646}
647
648.navpath li.navelem a {
649 height: 18px;
650 display: block;
651 text-decoration: none;
652 outline: none;
653}
654
655.navpath li.navelem a:hover {
656 color: #ffffff;
657 text-shadow: 0px 0px 5px #3399ff;
658}
659
660.navpath li.footer {
661 list-style-type:none;
662 float: right;
663 padding-left:10px;
664 padding-right:15px;
665 background-image:none;
666 background-repeat:no-repeat;
667 background-position:right;
668 color:#364D7C;
669 font-size: 9pt;
670}
671
672div.summary {
673 float: right;
674 font-size: 9pt;
675 padding-right: 10px;
676 padding-top: 10px;
677 width: 50%;
678 text-align: right;
679 color: #ffffff;
680 text-shadow: 0px 0px 5px #3399ff;
681}
682
683div.summary a {
684 white-space: nowrap;
685 color: #ffffff;
686 font-weight: bold;
687}
688
689div.ingroups {
690 margin-left: 5px;
691 font-size: 9pt;
692 padding-left: 5px;
693 width: 50%;
694 text-align: left;
695}
696
697div.ingroups a {
698 white-space: nowrap;
699 color: #ffffff;
700}
701
702.title {
703 font-size: 150%;
704 font-weight: bold;
705 margin: 20px 2px;
706 text-shadow: 0px 0px 5px #3399ff;
707 color: #ffffff;
708}
709
710div.header {
711 margin-left: auto;
712 margin-right: auto;
713 width: 980px;
714}
715
716div.headertitle {
717 background-color: #606060;
718 padding: 5px 0px 5px 0px;
719 text-align: center;
720 box-shadow: 0px 3px 5px #000000;
721 margin-bottom: 8px;
722}
723
724div.contents {
725 box-shadow: 0px 3px 10px #000000;
726 margin-left: auto;
727 margin-right: auto;
728 width: 940px;
729 background-color: white;
730 padding: 10px 20px;
731}
732
733#projectlogo {
734 text-align: center;
735 vertical-align: middle;
736 border-collapse: separate;
737}
738
739#projectlogo img {
740 border: 0px none;
741}
742
743#projectname {
744 font: 300% mono, monospace, fixed;
745 margin: 0px;
746 padding: 2px 0px;
747}
748
749#projectbrief {
750 font: 120% Arial, Helvetica, sans-serif;
751 margin: 0px;
752 padding: 0px;
753}
754
755#top {
756 background-color: #EBE9FE;
757}
758
759#titlearea {
760 box-shadow: 0px 3px 10px #000000;
761 width: 780px;
762 margin-left: auto;
763 margin-right: auto;
764 padding: 0px 10px 0px 10px;
765}
766
767#projectnumber {
768 font: 50% Tahoma, Arial, sans-serif;
769 margin: 0px;
770 padding: 0px;
771}
772
773dl {
774 padding: 0 0 0 10px;
775}
776
777dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug {
778 border-left: 4px solid;
779 padding: 0 0 0 6px;
780}
781
782dl.note {
783 border-color: #D0C000;
784}
785
786dl.warning, dl.attention {
787 border-color: #FF0000;
788}
789
790dl.pre, dl.post, dl.invariant {
791 border-color: #00D000;
792}
793
794dl.deprecated {
795 border-color: #505050;
796}
797
798dl.todo {
799 border-color: #00C0E0;
800}
801
802dl.test {
803 border-color: #3030E0;
804}
805
806dl.bug {
807 border-color: #C08050;
808}
809
810.image {
811 text-align: center;
812}
813
814.dotgraph {
815 text-align: center;
816}
817
818.mscgraph {
819 text-align: center;
820}
821
822.caption {
823 font-weight: bold;
824}
825
826div.zoom {
827 border: 1px solid #90A5CE;
828}
829
830dl.citelist {
831 margin-bottom: 50px;
832}
833
834dl.citelist dt {
835 color: #334975;
836 float: left;
837 font-weight: bold;
838 margin-right: 10px;
839 padding: 5px;
840}
841
842dl.citelist dd {
843 margin: 2px 0;
844 padding: 5px 0;
845}
846
847@media print {
848 #top { display: none; }
849 #side-nav { display: none; }
850 #nav-path { display: none; }
851 body { overflow:visible; }
852 h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
853 .summary { display: none; }
854 .memitem { page-break-inside: avoid; }
855 #doc-content {
856 margin-left:0 !important;
857 height:auto !important;
858 width:auto !important;
859 overflow: inherit;
860 display: inline;
861 }
862 pre.fragment {
863 overflow: visible;
864 text-wrap: unrestricted;
865 white-space: -moz-pre-wrap;
866 white-space: -pre-wrap;
867 white-space: -o-pre-wrap;
868 white-space: pre-wrap;
869 word-wrap: break-word;
870 }
871}
872
873.tabs, .tabs2, .tabs3 {
874 margin-left: auto;
875 margin-right: auto;
876 background-color: #606060;
877 padding: 5px 0px 5px 0px;
878 text-align: center;
879 box-shadow: 0px 3px 5px #000000;
880 width: 980px;
881 z-index: 101;
882 font-size: 9pt;
883}
884
885.tabs2 {
886 font-size: 9pt;
887}
888
889.tabs2 li {
890 margin-top: 9pt;
891}
892
893.tabs3 {
894 font-size: 9pt;
895}
896
897.tabs3 li {
898 margin-top: 9pt;
899}
900
901.tablist {
902 margin: 0;
903 padding: 0;
904 display: table;
905}
906
907.tablist li {
908 float: left;
909 display: table-cell;
910 line-height: 24px;
911 list-style: none;
912 margin-left: 8px;
913 margin-right: 8px;
914}
915
916.tablist a {
917 box-shadow: 0px 1px 2px #000000;
918 display: block;
919 padding: 0px 5px 0px 5px;
920 font-weight: bold;
921 color: #ffffff;
922 text-shadow: 0px 0px 5px #3399ff;
923 text-decoration: none;
924 outline: none;
925}
926
927.tabs3 .tablist a {
928 padding: 0px 5px;
929}
930
931.tablist a:hover {
932 color: #ffffff;
933 text-shadow: 0px 1px 0px #000000;
934 text-decoration: none;
935 background-color: #808080;
936}
937
938.tablist li.current a {
939 color: #202020;
940 background-color: #a0a0a0;
941 text-shadow: 0px 1px 0px #cccccc;
942}
diff --git a/doc/foot.html b/doc/foot.html
index d43cf8f..308b1d0 100644
--- a/doc/foot.html
+++ b/doc/foot.html
@@ -1,18 +1,2 @@
1
2 <div id="push"></div>
3 </div> <!-- #content -->
4 </div> <!-- .layout -->
5
6 </div> <!-- #container -->
7
8
9 <div id="footer">
10 <table><tr>
11 <td class="copyright">Copyright &copy;$year Enlightenment</td>
12 <td class="generated">Docs generated $datetime</td>
13 </tr></table>
14 </div>
15
16
17</body> 1</body>
18</html> 2</html>
diff --git a/doc/head.html b/doc/head.html
index f65818e..7b94f0f 100644
--- a/doc/head.html
+++ b/doc/head.html
@@ -1,68 +1,14 @@
1<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
2"http://www.w3.org/TR/html4/strict.dtd">
1<html> 3<html>
2<head> 4<head>
3 <title>$title</title> 5 <title>$title</title>
4 <meta http-equiv="content-type" content="text/html;charset=UTF-8"> 6 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5 <meta name="author" content="Andres Blanc" > 7 <link rel="icon" href="favicon.png" type="image/x-icon">
6 8 <link rel="shortcut icon" href="favicon.png" type="image/x-icon">
7 <link rel="icon" href="img/favicon.png" type="image/x-icon"> 9 <link rel="icon" href="favicon.png" type="image/ico">
8 <link rel="shortcut icon" href="img/favicon.png" type="image/x-icon"> 10 <link rel="shortcut icon" href="favicon.png" type="image/ico">
9 <link rel="icon" href="img/favicon.png" type="image/ico"> 11 <link rel="stylesheet" type="text/css" href="e.css">
10 <link rel="shortcut icon" href="img/favicon.png" type="image/ico">
11
12 <link rel="stylesheet" type="text/css" href="e.css">
13 <link rel="stylesheet" type="text/css" href="edoxy.css">
14</head> 12</head>
15 13
16<body> 14<body>
17
18<div id="container">
19
20<div id="header">
21<div class="layout">
22
23 <h1><span>Enlightenment</span></h1>
24 <h2><span>Beauty at your fingertips</span></h2>
25
26 <table cellspacing="0" cellpadding="0" width="100%"><tr>
27 <td id="header_logo">
28 <a href="http://www.enlightenment.org"></a>
29 </td>
30 <td id="header_menu">
31 <table cellspacing="0" cellpadding="0" align="right"><tr>
32 <td class="nav_passive"><a class="nav_passive" href="http://www.enlightenment.org/p.php?p=home">Home</a></td>
33 <td class="nav_passive"><a class="nav_passive" href="http://www.enlightenment.org/p.php?p=news">News</a></td>
34 <td class="nav_passive"><a class="nav_passive" href="http://www.enlightenment.org/p.php?p=about">About</a></td>
35 <td class="nav_passive"><a class="nav_passive" href="http://www.enlightenment.org/p.php?p=download">Download</a></td>
36 <td class="nav_passive"><a class="nav_passive" href="http://www.enlightenment.org/p.php?p=support">Support</a></td>
37 <td class="nav_passive"><a class="nav_passive" href="http://www.enlightenment.org/p.php?p=contribute">Contribute</a></td>
38 <td class="nav_passive"><a class="nav_passive" href="http://www.enlightenment.org/p.php?p=contact">Contact</a></td>
39 <td class="nav_passive"><a class="nav_passive" href="http://trac.enlightenment.org/e">Tracker</a></td>
40 <td class="nav_passive"><a class="nav_passive" href="http://www.enlightenment.org/p.php?p=docs">Docs</a></td>
41 </tr></table>
42 </td>
43 <td id="header_last"></td>
44 </tr></table>
45
46 <div class="doxytitle">
47 $projectname Documentation <small>at $date</small>
48 </div>
49
50 <div class="menu-container">
51 <div class="submenu">
52 <ul class="current">
53 <li><a href="files.html">Files</a></li>
54 <li><a href="globals.html">Globals</a></li>
55 <li><a href="Esskyuehl_8h.html">API Reference</a></li>
56 <li><a href="modules.html">Modules</a></li>
57 <li class="current"><a href="index.html">Main Page</a></li>
58 </ul>
59 </div>
60 </div>
61
62
63 <div class="clear"></div>
64</div>
65</div>
66
67<div id="content">
68<div class="layout">
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 31efa68..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
1SUBDIRS = lib modules tests
2
3MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
deleted file mode 100644
index 91c9eb3..0000000
--- a/src/lib/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
1pkginclude_HEADERS = Esskyuehl.h
2pkgincludedir = @includedir@/esskyuehl-@VMAJ@
3
4AM_CFLAGS = \
5 @EFL_CFLAGS@ \
6 -DESQL_MODULE_PATH=\"$(libdir)/esskyuehl/$(MODULE_ARCH)\" \
7 -I@top_srcdir@
8
9
10lib_LTLIBRARIES = libesskyuehl.la
11
12libesskyuehl_la_LIBADD = \
13 @EFL_LIBS@
14
15libesskyuehl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
16
17libesskyuehl_la_SOURCES = \
18esql_private.h \
19esql.c \
20esql_alloc.c \
21esql_connect.c \
22esql_convert.c \
23esql_events.c \
24esql_module.c \
25esql_pool.c \
26esql_query.c \
27esql_res.c
28
29MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/lib/Makefile.mk b/src/lib/Makefile.mk
new file mode 100644
index 0000000..79b40f8
--- /dev/null
+++ b/src/lib/Makefile.mk
@@ -0,0 +1,26 @@
1pkginclude_HEADERS = src/lib/Esskyuehl.h
2pkgincludedir = @includedir@/esskyuehl-@VMAJ@
3
4lib_LTLIBRARIES = src/lib/libesskyuehl.la
5
6src_lib_libesskyuehl_la_CFLAGS = \
7$(MOD_CFLAGS) \
8-DESQL_MODULE_PATH=\"$(libdir)/esskyuehl/$(MODULE_ARCH)\"
9
10src_lib_libesskyuehl_la_LIBADD = \
11@EFL_LIBS@
12
13src_lib_libesskyuehl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
14
15src_lib_libesskyuehl_la_SOURCES = \
16src/lib/esql_private.h \
17src/lib/esql.c \
18src/lib/esql_alloc.c \
19src/lib/esql_connect.c \
20src/lib/esql_convert.c \
21src/lib/esql_events.c \
22src/lib/esql_module.c \
23src/lib/esql_module.h \
24src/lib/esql_pool.c \
25src/lib/esql_query.c \
26src/lib/esql_res.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
deleted file mode 100644
index 52ac4c1..0000000
--- a/src/modules/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
1SUBDIRS =
2
3if MYSQL
4SUBDIRS += mysql
5endif
6
7if POSTGRESQL
8SUBDIRS += postgresql
9endif
10
11if SQLITE
12SUBDIRS += sqlite
13endif
14
15MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/modules/mysql/Makefile.am b/src/modules/mysql/Makefile.am
deleted file mode 100644
index 23f564d..0000000
--- a/src/modules/mysql/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
1SUBDIRS = mysac
2MAINTAINERCLEANFILES = Makefile.in
3
4moddir = $(libdir)/esskyuehl/$(MODULE_ARCH)
5mod_LTLIBRARIES = mysql.la
6
7mysql_la_SOURCES = \
8esql_mysql_backend.c
9
10mysql_la_CFLAGS = \
11 @EFL_CFLAGS@ \
12 @MYSQL_CFLAGS@ \
13 -I$(top_srcdir)/src/lib \
14 -Imysac
15mysql_la_LIBADD = \
16 $(top_builddir)/src/lib/libesskyuehl.la \
17 @EFL_LIBS@ @MYSQL_LIBS@ \
18 mysac/libmysac.la
19mysql_la_LDFLAGS = -no-undefined -module -avoid-version
20mysql_la_LIBTOOLFLAGS = --tag=disable-static
21
diff --git a/src/modules/mysql/Makefile.mk b/src/modules/mysql/Makefile.mk
new file mode 100644
index 0000000..571b6bc
--- /dev/null
+++ b/src/modules/mysql/Makefile.mk
@@ -0,0 +1,23 @@
1EXTRA_DIST += \
2src/modules/mysql/esql_mysql_backend.c
3
4if MYSQL
5mod_LTLIBRARIES += src/modules/mysql/mysql.la
6
7src_modules_mysql_mysql_la_SOURCES = \
8src/modules/mysql/esql_mysql_backend.c
9
10src_modules_mysql_mysql_la_CFLAGS = \
11$(MOD_CFLAGS) \
12@MYSQL_CFLAGS@ \
13-Isrc/modules/mysql/mysac
14
15src_modules_mysql_mysql_la_LIBADD = \
16$(MOD_LIBS) \
17@MYSQL_LIBS@ \
18src/modules/mysql/mysac/libmysac.la
19
20src_modules_mysql_mysql_la_LDFLAGS = $(LD_FLAGS)
21src_modules_mysql_mysql_la_LIBTOOLFLAGS = $(LT_FLAGS)
22endif
23include src/modules/mysql/mysac/Makefile.mk
diff --git a/src/modules/mysql/mysac/Makefile.am b/src/modules/mysql/mysac/Makefile.am
deleted file mode 100644
index a573b0e..0000000
--- a/src/modules/mysql/mysac/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
1AM_CFLAGS = \
2 -I@top_srcdir@ \
3 @MYSQL_CFLAGS@
4
5
6noinst_LTLIBRARIES = libmysac.la
7libmysac_la_LIBADD = @MYSQL_LIBS@
8libmysac_la_SOURCES = \
9mysac.c \
10mysac_encode_values.c \
11mysac_query.c \
12mysac_connect.c \
13mysac_encode_values.h \
14mysac_res.c \
15mysac_decode_field.c \
16mysac_errors.c \
17mysac_stmt.c \
18mysac_decode_field.h \
19mysac.h \
20mysac_usedatabase.c \
21mysac_decode_respbloc.c \
22mysac_memory.c \
23mysac_utils.c \
24mysac_decode_respbloc.h \
25mysac_memory.h \
26mysac_utils.h \
27mysac_decode_row.c \
28mysac_net.c \
29mysac_decode_row.h \
30mysac_net.h
31
32MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/modules/mysql/mysac/Makefile.mk b/src/modules/mysql/mysac/Makefile.mk
new file mode 100644
index 0000000..6208541
--- /dev/null
+++ b/src/modules/mysql/mysac/Makefile.mk
@@ -0,0 +1,37 @@
1MYSAC_SRC = \
2src/modules/mysql/mysac/mysac.c \
3src/modules/mysql/mysac/mysac_encode_values.c \
4src/modules/mysql/mysac/mysac_query.c \
5src/modules/mysql/mysac/mysac_connect.c \
6src/modules/mysql/mysac/mysac_encode_values.h \
7src/modules/mysql/mysac/mysac_res.c \
8src/modules/mysql/mysac/mysac_decode_field.c \
9src/modules/mysql/mysac/mysac_errors.c \
10src/modules/mysql/mysac/mysac_stmt.c \
11src/modules/mysql/mysac/mysac_decode_field.h \
12src/modules/mysql/mysac/mysac.h \
13src/modules/mysql/mysac/mysac_usedatabase.c \
14src/modules/mysql/mysac/mysac_decode_respbloc.c \
15src/modules/mysql/mysac/mysac_memory.c \
16src/modules/mysql/mysac/mysac_utils.c \
17src/modules/mysql/mysac/mysac_decode_respbloc.h \
18src/modules/mysql/mysac/mysac_memory.h \
19src/modules/mysql/mysac/mysac_utils.h \
20src/modules/mysql/mysac/mysac_decode_row.c \
21src/modules/mysql/mysac/mysac_net.c \
22src/modules/mysql/mysac/mysac_decode_row.h \
23src/modules/mysql/mysac/mysac_net.h
24
25EXTRA_DIST += $(MYSAC_SRC)
26
27if MYSQL
28noinst_LTLIBRARIES = src/modules/mysql/mysac/libmysac.la
29
30src_modules_mysql_mysac_libmysac_la_LIBADD = @MYSQL_LIBS@
31src_modules_mysql_mysac_libmysac_la_CFLAGS = \
32-I@top_srcdir@ \
33@MYSQL_CFLAGS@
34
35src_modules_mysql_mysac_libmysac_la_SOURCES = \
36$(MYSAC_SRC)
37endif
diff --git a/src/modules/postgresql/Makefile.am b/src/modules/postgresql/Makefile.am
deleted file mode 100644
index 7f6c517..0000000
--- a/src/modules/postgresql/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3moddir = $(libdir)/esskyuehl/$(MODULE_ARCH)
4mod_LTLIBRARIES = psql.la
5
6psql_la_SOURCES = \
7esql_postgresql_backend.c
8
9psql_la_CFLAGS = \
10 @EFL_CFLAGS@ \
11 -I$(top_srcdir)/src/lib \
12 @POSTGRESQL_CFLAGS@
13psql_la_LIBADD = \
14 $(top_builddir)/src/lib/libesskyuehl.la \
15 @EFL_LIBS@ @POSTGRESQL_LIBS@
16psql_la_LDFLAGS = -no-undefined -module -avoid-version
17psql_la_LIBTOOLFLAGS = --tag=disable-static
18
diff --git a/src/modules/postgresql/Makefile.mk b/src/modules/postgresql/Makefile.mk
new file mode 100644
index 0000000..804141e
--- /dev/null
+++ b/src/modules/postgresql/Makefile.mk
@@ -0,0 +1,19 @@
1EXTRA_DIST += src/modules/postgresql/esql_postgresql_backend.c
2
3if POSTGRESQL
4mod_LTLIBRARIES += src/modules/postgresql/psql.la
5
6src_modules_postgresql_psql_la_SOURCES = \
7src/modules/postgresql/esql_postgresql_backend.c
8
9src_modules_postgresql_psql_la_CFLAGS = \
10$(MOD_CFLAGS) \
11@POSTGRESQL_CFLAGS@
12
13src_modules_postgresql_psql_la_LIBADD = \
14$(MOD_LIBS) \
15@POSTGRESQL_LIBS@
16
17src_modules_postgresql_psql_la_LDFLAGS = $(LD_FLAGS)
18src_modules_postgresql_psql_la_LIBTOOLFLAGS = $(LT_FLAGS)
19endif
diff --git a/src/modules/sqlite/Makefile.am b/src/modules/sqlite/Makefile.am
deleted file mode 100644
index 7229a94..0000000
--- a/src/modules/sqlite/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3moddir = $(libdir)/esskyuehl/$(MODULE_ARCH)
4mod_LTLIBRARIES = sqlite.la
5
6sqlite_la_SOURCES = \
7esql_sqlite_backend.c
8
9sqlite_la_CFLAGS = \
10 @EFL_CFLAGS@ \
11 -I$(top_srcdir)/src/lib \
12 @SQLITE3_CFLAGS@
13sqlite_la_LIBADD = \
14 $(top_builddir)/src/lib/libesskyuehl.la \
15 @EFL_LIBS@ @SQLITE3_LIBS@
16sqlite_la_LDFLAGS = -no-undefined -module -avoid-version
17sqlite_la_LIBTOOLFLAGS = --tag=disable-static
18
diff --git a/src/modules/sqlite/Makefile.mk b/src/modules/sqlite/Makefile.mk
new file mode 100644
index 0000000..fdd2442
--- /dev/null
+++ b/src/modules/sqlite/Makefile.mk
@@ -0,0 +1,19 @@
1EXTRA_DIST += src/modules/sqlite/esql_sqlite_backend.c
2
3if SQLITE
4mod_LTLIBRARIES += src/modules/sqlite/sqlite.la
5
6src_modules_sqlite_sqlite_la_SOURCES = \
7src/modules/sqlite/esql_sqlite_backend.c
8
9src_modules_sqlite_sqlite_la_CFLAGS = \
10$(MOD_CFLAGS) \
11@SQLITE3_CFLAGS@
12
13src_modules_sqlite_sqlite_la_LIBADD = \
14$(MOD_LIBS) \
15@SQLITE3_LIBS@
16
17src_modules_sqlite_sqlite_la_LDFLAGS = $(LD_FLAGS)
18src_modules_sqlite_sqlite_la_LIBTOOLFLAGS = $(LT_FLAGS)
19endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
deleted file mode 100644
index 8cf4627..0000000
--- a/src/tests/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CFLAGS = \
4 @MYSQL_CFLAGS@ \
5 @POSTGRESQL_CFLAGS@ \
6 @EFL_CFLAGS@ \
7 -I@top_builddir@ \
8 -I@top_srcdir@/src/lib
9
10LDADD = \
11 @MYSQL_LIBS@ \
12 @POSTGRESQL_LIBS@ \
13 @EFL_LIBS@ \
14 @top_builddir@/src/lib/libesskyuehl.la
15
16check_PROGRAMS = basic_query basic_pool
17
18
19if SQLITE
20check_PROGRAMS += test_sqlite
21endif
22
23basic_query_SOURCES = basic_query.c
24basic_pool_SOURCES = basic_pool.c
25test_sqlite_SOURCES = test_sqlite.c
diff --git a/src/tests/Makefile.mk b/src/tests/Makefile.mk
new file mode 100644
index 0000000..b877d06
--- /dev/null
+++ b/src/tests/Makefile.mk
@@ -0,0 +1,18 @@
1check_PROGRAMS = \
2src/tests/basic_query \
3src/tests/basic_pool
4
5
6if SQLITE
7check_PROGRAMS += src/tests/test_sqlite
8endif
9
10src_tests_basic_query_SOURCES = src/tests/basic_query.c
11src_tests_basic_query_CFLAGS = $(MOD_CFLAGS)
12src_tests_basic_query_LDADD = $(MOD_LIBS)
13src_tests_basic_pool_SOURCES = src/tests/basic_pool.c
14src_tests_basic_pool_CFLAGS = $(MOD_CFLAGS)
15src_tests_basic_pool_LDADD = $(MOD_LIBS)
16src_tests_test_sqlite_SOURCES = src/tests/test_sqlite.c
17src_tests_test_sqlite_CFLAGS = $(MOD_CFLAGS)
18src_tests_test_sqlite_LDADD = $(MOD_LIBS)