summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am10
-rw-r--r--src/Makefile_Edje.am30
-rw-r--r--src/Makefile_Eeze.am2
-rw-r--r--src/lib/ecore/Ecore_Common.h6
-rw-r--r--src/lib/ecore_x/Ecore_X.h14
-rw-r--r--src/lib/ecore_x/ecore_x_version.h.in13
-rw-r--r--src/lib/edje/Edje.h5
-rw-r--r--src/lib/eet/Eet.h5
-rw-r--r--src/lib/eeze/Eeze.h5
-rw-r--r--src/lib/efl/Efl_Config.h.in3
-rw-r--r--src/lib/efreet/Efreet.h5
-rw-r--r--src/lib/eina/eina_main.h6
-rw-r--r--src/lib/eio/Eio.h5
-rw-r--r--src/lib/eldbus/Eldbus.h5
-rw-r--r--src/lib/embryo/Embryo.h6
-rw-r--r--src/lib/emotion/Emotion.h5
-rw-r--r--src/lib/ephysics/EPhysics.h5
-rw-r--r--src/lib/ethumb/Ethumb.h5
-rw-r--r--src/lib/evas/Evas_Common.h4
19 files changed, 91 insertions, 48 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index f4f49a8..6ceedd2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ check_PROGRAMS =
15TESTS = 15TESTS =
16EXTRA_DIST = 16EXTRA_DIST =
17 17
18EFL_INSTALL_DATA_HOOK= 18EFL_INSTALL_EXEC_HOOK=
19 19
20include Makefile_Efl.am 20include Makefile_Efl.am
21 21
@@ -102,9 +102,5 @@ clean-local:
102 find . -type f -name '*.gcda' -delete 102 find . -type f -name '*.gcda' -delete
103 find . -type f -name check-results.xml -delete 103 find . -type f -name check-results.xml -delete
104 104
105install-data-hook: 105install-exec-hook:
106 $(EFL_INSTALL_DATA_HOOK) 106 $(EFL_INSTALL_EXEC_HOOK)
107 for i in $(lib_LTLIBRARIES); do \
108 export file=`basename $$i`; \
109 sed -e "s/-luuid//" $(DESTDIR)${libdir}/$$file > $(DESTDIR)${libdir}/$$file.tmp && mv $(DESTDIR)${libdir}/$$file.tmp $(DESTDIR)${libdir}/$$file; \
110 done
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 6c1daf9..6b4cad4 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -210,7 +210,35 @@ bin/edje/edje_convert.c \
210bin/edje/edje_data_convert.c \ 210bin/edje/edje_data_convert.c \
211bin/edje/edje_convert_main.c \ 211bin/edje/edje_convert_main.c \
212lib/edje/edje_convert.c \ 212lib/edje/edje_convert.c \
213tests/edje/edje_tests_helpers.h 213tests/edje/edje_tests_helpers.h \
214tests/edje/data/complex_layout.edc \
215tests/edje/data/test_layout.edc \
216tests/emotion/data/theme.edc \
217tests/emotion/data/icon.edc \
218tests/emotion/data/bpause.png \
219tests/emotion/data/bplay.png \
220tests/emotion/data/bstop.png \
221tests/emotion/data/e_logo.png \
222tests/emotion/data/fr1.png \
223tests/emotion/data/fr2.png \
224tests/emotion/data/fr3.png \
225tests/emotion/data/fr4.png \
226tests/emotion/data/fr5.png \
227tests/emotion/data/fr6.png \
228tests/emotion/data/fr7.png \
229tests/emotion/data/h_slider.png \
230tests/emotion/data/knob.png \
231tests/emotion/data/orb.png \
232tests/emotion/data/pnl.png \
233tests/emotion/data/sl.png \
234tests/emotion/data/tiles.png \
235tests/emotion/data/video_frame_bottom.png \
236tests/emotion/data/video_frame_left.png \
237tests/emotion/data/video_frame_right.png \
238tests/emotion/data/video_frame_top.png \
239tests/emotion/data/whb.png \
240tests/emotion/data/window_inner_shadow.png
241
214 242
215bin_SCRIPTS += bin/edje/edje_recc 243bin_SCRIPTS += bin/edje/edje_recc
216 244
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index eaa41d7..499193d 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -134,7 +134,7 @@ bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
134 134
135setuid_root_mode = a=rx,u+xs 135setuid_root_mode = a=rx,u+xs
136 136
137EFL_INSTALL_DATA_HOOK+=@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true; 137EFL_INSTALL_EXEC_HOOK+=@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true;
138 138
139 139
140### Unit tests 140### Unit tests
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 83307f2..eceb4ed 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -2,6 +2,8 @@
2extern "C" { 2extern "C" {
3#endif 3#endif
4 4
5#include <Efl_Config.h>
6
5/** 7/**
6 * @defgroup Ecore_Init_Group Ecore initialization, shutdown functions and reset on fork. 8 * @defgroup Ecore_Init_Group Ecore initialization, shutdown functions and reset on fork.
7 * @ingroup Ecore 9 * @ingroup Ecore
@@ -30,8 +32,8 @@ EAPI int ecore_shutdown(void);
30 * @{ 32 * @{
31 */ 33 */
32 34
33#define ECORE_VERSION_MAJOR 1 35#define ECORE_VERSION_MAJOR EFL_VERSION_MAJOR
34#define ECORE_VERSION_MINOR 8 36#define ECORE_VERSION_MINOR EFL_VERSION_MINOR
35 37
36typedef struct _Ecore_Version 38typedef struct _Ecore_Version
37{ 39{
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index e0e24ae..4341711 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -2,6 +2,7 @@
2#define _ECORE_X_H 2#define _ECORE_X_H
3 3
4#include <Eina.h> 4#include <Eina.h>
5#include <Efl_Config.h>
5 6
6#ifdef EAPI 7#ifdef EAPI
7# undef EAPI 8# undef EAPI
@@ -25,6 +26,19 @@
25# endif // ifdef __GNUC__ 26# endif // ifdef __GNUC__
26#endif // ifdef _MSC_VER 27#endif // ifdef _MSC_VER
27 28
29#define ECORE_X_VERSION_MAJOR EFL_VERSION_MAJOR
30#define ECORE_X_VERSION_MINOR EFL_VERSION_MINOR
31
32typedef struct _Ecore_X_Version
33{
34 int major;
35 int minor;
36 int micro;
37 int revision;
38} Ecore_X_Version;
39
40EAPI extern Ecore_X_Version *ecore_x_version;
41
28#include "ecore_x_version.h" 42#include "ecore_x_version.h"
29 43
30#include <sys/types.h> 44#include <sys/types.h>
diff --git a/src/lib/ecore_x/ecore_x_version.h.in b/src/lib/ecore_x/ecore_x_version.h.in
index 24de5f8..98f1d6a 100644
--- a/src/lib/ecore_x/ecore_x_version.h.in
+++ b/src/lib/ecore_x/ecore_x_version.h.in
@@ -1,19 +1,6 @@
1#ifndef _ECORE_X_VERSION_H_ 1#ifndef _ECORE_X_VERSION_H_
2#define _ECORE_X_VERSION_H_ 1 2#define _ECORE_X_VERSION_H_ 1
3 3
4#define ECORE_X_VERSION_MAJOR @VMAJ@
5#define ECORE_X_VERSION_MINOR @VMIN@
6
7typedef struct _Ecore_X_Version
8{
9 int major;
10 int minor;
11 int micro;
12 int revision;
13} Ecore_X_Version;
14
15EAPI extern Ecore_X_Version *ecore_x_version;
16
17#ifndef @HAVE_ECORE_X_BACKEND@ 4#ifndef @HAVE_ECORE_X_BACKEND@
18#define @HAVE_ECORE_X_BACKEND@ 1 5#define @HAVE_ECORE_X_BACKEND@ 1
19#endif 6#endif
diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h
index 8a460e9..015dcad 100644
--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@@ -214,6 +214,7 @@ param in edje programs
214 214
215#include <Evas.h> 215#include <Evas.h>
216#include <Eo.h> 216#include <Eo.h>
217#include <Efl_Config.h>
217 218
218#ifdef EAPI 219#ifdef EAPI
219# undef EAPI 220# undef EAPI
@@ -245,8 +246,8 @@ param in edje programs
245extern "C" { 246extern "C" {
246#endif 247#endif
247 248
248#define EDJE_VERSION_MAJOR 1 249#define EDJE_VERSION_MAJOR EFL_VERSION_MAJOR
249#define EDJE_VERSION_MINOR 8 250#define EDJE_VERSION_MINOR EFL_VERSION_MINOR
250 251
251#include "Edje_Common.h" 252#include "Edje_Common.h"
252#ifndef EFL_NOLEGACY_API_SUPPORT 253#ifndef EFL_NOLEGACY_API_SUPPORT
diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h
index de57e4a..ab90733 100644
--- a/src/lib/eet/Eet.h
+++ b/src/lib/eet/Eet.h
@@ -97,6 +97,7 @@
97#include <stdlib.h> 97#include <stdlib.h>
98#include <stdio.h> 98#include <stdio.h>
99#include <Eina.h> 99#include <Eina.h>
100#include <Efl_Config.h>
100 101
101#ifdef EAPI 102#ifdef EAPI
102# undef EAPI 103# undef EAPI
@@ -136,8 +137,8 @@ extern "C" {
136 * 137 *
137 */ 138 */
138 139
139#define EET_VERSION_MAJOR 1 140#define EET_VERSION_MAJOR EFL_VERSION_MAJOR
140#define EET_VERSION_MINOR 8 141#define EET_VERSION_MINOR EFL_VERSION_MINOR
141/** 142/**
142 * @typedef Eet_Version 143 * @typedef Eet_Version
143 * 144 *
diff --git a/src/lib/eeze/Eeze.h b/src/lib/eeze/Eeze.h
index 82ef11a..55d2230 100644
--- a/src/lib/eeze/Eeze.h
+++ b/src/lib/eeze/Eeze.h
@@ -73,6 +73,7 @@
73#define EEZE_UDEV_H 73#define EEZE_UDEV_H
74 74
75#include <Eina.h> 75#include <Eina.h>
76#include <Efl_Config.h>
76 77
77#ifdef EAPI 78#ifdef EAPI
78# undef EAPI 79# undef EAPI
@@ -270,8 +271,8 @@ struct Eeze_Udev_Watch;
270 */ 271 */
271typedef struct Eeze_Udev_Watch Eeze_Udev_Watch; 272typedef struct Eeze_Udev_Watch Eeze_Udev_Watch;
272 273
273#define EEZE_VERSION_MAJOR 1 274#define EEZE_VERSION_MAJOR EFL_VERSION_MAJOR
274#define EEZE_VERSION_MINOR 8 275#define EEZE_VERSION_MINOR EFL_VERSION_MINOR
275 276
276 typedef struct _Eeze_Version 277 typedef struct _Eeze_Version
277 { 278 {
diff --git a/src/lib/efl/Efl_Config.h.in b/src/lib/efl/Efl_Config.h.in
index 5bf7f6a..ad17684 100644
--- a/src/lib/efl/Efl_Config.h.in
+++ b/src/lib/efl/Efl_Config.h.in
@@ -13,4 +13,7 @@
13/* @EFL_API_EO_DEF@ */ 13/* @EFL_API_EO_DEF@ */
14#endif 14#endif
15 15
16#define EFL_VERSION_MAJOR @EFL_VERSION_MAJOR@
17#define EFL_VERSION_MINOR @EFL_VERSION_MINOR@
18
16#endif 19#endif
diff --git a/src/lib/efreet/Efreet.h b/src/lib/efreet/Efreet.h
index ae1ec18..e2360ee 100644
--- a/src/lib/efreet/Efreet.h
+++ b/src/lib/efreet/Efreet.h
@@ -72,6 +72,7 @@
72 */ 72 */
73 73
74#include <Eina.h> 74#include <Eina.h>
75#include <Efl_Config.h>
75 76
76#ifdef EAPI 77#ifdef EAPI
77# undef EAPI 78# undef EAPI
@@ -103,8 +104,8 @@
103extern "C" { 104extern "C" {
104#endif 105#endif
105 106
106#define EFREET_VERSION_MAJOR 1 107#define EFREET_VERSION_MAJOR EFL_VERSION_MAJOR
107#define EFREET_VERSION_MINOR 8 108#define EFREET_VERSION_MINOR EFL_VERSION_MINOR
108 109
109 typedef struct _Efreet_Version 110 typedef struct _Efreet_Version
110 { 111 {
diff --git a/src/lib/eina/eina_main.h b/src/lib/eina/eina_main.h
index 41ea2a5..d7a7f0b 100644
--- a/src/lib/eina/eina_main.h
+++ b/src/lib/eina/eina_main.h
@@ -19,6 +19,8 @@
19#ifndef EINA_MAIN_H_ 19#ifndef EINA_MAIN_H_
20#define EINA_MAIN_H_ 20#define EINA_MAIN_H_
21 21
22#include <Efl_Config.h>
23
22#include "eina_types.h" 24#include "eina_types.h"
23 25
24/** 26/**
@@ -44,13 +46,13 @@
44 * @def EINA_VERSION_MAJOR 46 * @def EINA_VERSION_MAJOR
45 * @brief Major version of Eina 47 * @brief Major version of Eina
46 */ 48 */
47#define EINA_VERSION_MAJOR 1 49#define EINA_VERSION_MAJOR EFL_VERSION_MAJOR
48 50
49/** 51/**
50 * @def EINA_VERSION_MINOR 52 * @def EINA_VERSION_MINOR
51 * @brief Minor version of Eina 53 * @brief Minor version of Eina
52 */ 54 */
53#define EINA_VERSION_MINOR 8 55#define EINA_VERSION_MINOR EFL_VERSION_MINOR
54 56
55/** 57/**
56 * @typedef Eina_Version 58 * @typedef Eina_Version
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index fde08d1..7c9bd06 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -30,6 +30,7 @@
30 30
31#include <Eina.h> 31#include <Eina.h>
32#include <Eet.h> 32#include <Eet.h>
33#include <Efl_Config.h>
33 34
34#ifdef EAPI 35#ifdef EAPI
35# undef EAPI 36# undef EAPI
@@ -62,8 +63,8 @@
62extern "C" { 63extern "C" {
63#endif 64#endif
64 65
65#define EIO_VERSION_MAJOR 1 66#define EIO_VERSION_MAJOR EFL_VERSION_MAJOR
66#define EIO_VERSION_MINOR 8 67#define EIO_VERSION_MINOR EFL_VERSION_MINOR
67 68
68 /** 69 /**
69 * @typedef Eio_Version 70 * @typedef Eio_Version
diff --git a/src/lib/eldbus/Eldbus.h b/src/lib/eldbus/Eldbus.h
index cc069a0..478fcea 100644
--- a/src/lib/eldbus/Eldbus.h
+++ b/src/lib/eldbus/Eldbus.h
@@ -78,6 +78,7 @@
78 78
79#include <Eina.h> 79#include <Eina.h>
80#include <stdarg.h> 80#include <stdarg.h>
81#include <Efl_Config.h>
81 82
82#ifdef EAPI 83#ifdef EAPI
83# undef EAPI 84# undef EAPI
@@ -115,8 +116,8 @@ extern "C" {
115 * 116 *
116 * @{ 117 * @{
117 */ 118 */
118#define ELDBUS_VERSION_MAJOR 1 119#define ELDBUS_VERSION_MAJOR EFL_VERSION_MAJOR
119#define ELDBUS_VERSION_MINOR 8 120#define ELDBUS_VERSION_MINOR EFL_VERSION_MINOR
120 121
121#define ELDBUS_FDO_BUS "org.freedesktop.DBus" 122#define ELDBUS_FDO_BUS "org.freedesktop.DBus"
122#define ELDBUS_FDO_PATH "/org/freedesktop/DBus" 123#define ELDBUS_FDO_PATH "/org/freedesktop/DBus"
diff --git a/src/lib/embryo/Embryo.h b/src/lib/embryo/Embryo.h
index e9020d4..923afe7 100644
--- a/src/lib/embryo/Embryo.h
+++ b/src/lib/embryo/Embryo.h
@@ -336,6 +336,8 @@ This is the @e only file you need to include.
336#ifndef _EMBRYO_H 336#ifndef _EMBRYO_H
337#define _EMBRYO_H 337#define _EMBRYO_H
338 338
339#include <Efl_Config.h>
340
339#ifdef EAPI 341#ifdef EAPI
340# undef EAPI 342# undef EAPI
341#endif 343#endif
@@ -366,8 +368,8 @@ This is the @e only file you need to include.
366extern "C" { 368extern "C" {
367#endif 369#endif
368 370
369#define EMBRYO_VERSION_MAJOR 1 371#define EMBRYO_VERSION_MAJOR EFL_VERSION_MAJOR
370#define EMBRYO_VERSION_MINOR 8 372#define EMBRYO_VERSION_MINOR EFL_VERSION_MINOR
371 373
372 typedef struct _Embryo_Version 374 typedef struct _Embryo_Version
373 { 375 {
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h
index 34d1cc3..7240d2f 100644
--- a/src/lib/emotion/Emotion.h
+++ b/src/lib/emotion/Emotion.h
@@ -92,6 +92,7 @@
92 */ 92 */
93 93
94#include <Evas.h> 94#include <Evas.h>
95#include <Efl_Config.h>
95 96
96#ifdef EAPI 97#ifdef EAPI
97# undef EAPI 98# undef EAPI
@@ -262,8 +263,8 @@ typedef enum _Emotion_Aspect Emotion_Aspect; /**< Aspect ratio option. */
262extern "C" { 263extern "C" {
263#endif 264#endif
264 265
265#define EMOTION_VERSION_MAJOR 1 266#define EMOTION_VERSION_MAJOR EFL_VERSION_MAJOR
266#define EMOTION_VERSION_MINOR 8 267#define EMOTION_VERSION_MINOR EFL_VERSION_MINOR
267 268
268 typedef struct _Emotion_Version 269 typedef struct _Emotion_Version
269 { 270 {
diff --git a/src/lib/ephysics/EPhysics.h b/src/lib/ephysics/EPhysics.h
index 90ea09f..f3716f9 100644
--- a/src/lib/ephysics/EPhysics.h
+++ b/src/lib/ephysics/EPhysics.h
@@ -65,6 +65,7 @@
65 */ 65 */
66 66
67#include <Evas.h> 67#include <Evas.h>
68#include <Efl_Config.h>
68 69
69#ifdef EAPI 70#ifdef EAPI
70# undef EAPI 71# undef EAPI
@@ -96,8 +97,8 @@
96extern "C" { 97extern "C" {
97#endif 98#endif
98 99
99#define EPHYSICS_VERSION_MAJOR 0 100#define EPHYSICS_VERSION_MAJOR EFL_VERSION_MAJOR
100#define EPHYSICS_VERSION_MINOR 1 101#define EPHYSICS_VERSION_MINOR EFL_VERSION_MINOR
101 102
102/** 103/**
103 * @file 104 * @file
diff --git a/src/lib/ethumb/Ethumb.h b/src/lib/ethumb/Ethumb.h
index fd4dff7..4f91433 100644
--- a/src/lib/ethumb/Ethumb.h
+++ b/src/lib/ethumb/Ethumb.h
@@ -2,6 +2,7 @@
2#define __ETHUMB_H__ 1 2#define __ETHUMB_H__ 1
3 3
4#include <Eina.h> 4#include <Eina.h>
5#include <Efl_Config.h>
5 6
6#ifdef EAPI 7#ifdef EAPI
7# undef EAPI 8# undef EAPI
@@ -33,8 +34,8 @@
33extern "C" { 34extern "C" {
34#endif 35#endif
35 36
36#define ETHUMB_VERSION_MAJOR 1 37#define ETHUMB_VERSION_MAJOR EFL_VERSION_MAJOR
37#define ETHUMB_VERSION_MINOR 8 38#define ETHUMB_VERSION_MINOR EFL_VERSION_MINOR
38 39
39 typedef struct _Ethumb_Version 40 typedef struct _Ethumb_Version
40 { 41 {
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 007c0ac..3dbe604 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -2,8 +2,8 @@
2# error You shall not include this header directly 2# error You shall not include this header directly
3#endif 3#endif
4 4
5#define EVAS_VERSION_MAJOR 1 5#define EVAS_VERSION_MAJOR EFL_VERSION_MAJOR
6#define EVAS_VERSION_MINOR 8 6#define EVAS_VERSION_MINOR EFL_VERSION_MINOR
7 7
8typedef struct _Evas_Version 8typedef struct _Evas_Version
9{ 9{