summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac20
-rw-r--r--m4/efl_binary.m46
-rw-r--r--m4/efl_compiler.m46
-rw-r--r--src/bin/Makefile.am4
-rw-r--r--src/examples/Makefile.am4
-rw-r--r--src/lib/Makefile.am8
-rw-r--r--src/tests/Makefile.am8
8 files changed, 50 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index c1a9b4507c..a1f81df2ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,11 @@ if HAVE_WINDOWS
58pkgconfig_DATA += evil.pc 58pkgconfig_DATA += evil.pc
59endif 59endif
60 60
61pkgconfig_DATA += eina.pc eet.pc 61pkgconfig_DATA += eina.pc
62
63if EFL_BUILD_EET
64pkgconfig_DATA += eet.pc
65endif
62 66
63 67
64.PHONY: doc benchmark examples install-examples 68.PHONY: doc benchmark examples install-examples
@@ -94,7 +98,9 @@ if EFL_ENABLE_COVERAGE
94 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 98 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
95endif 99endif
96 @./src/tests/eina/eina_suite$(EXEEXT) 100 @./src/tests/eina/eina_suite$(EXEEXT)
101if EFL_BUILD_EET
97 @./src/tests/eet/eet_suite$(EXEEXT) 102 @./src/tests/eet/eet_suite$(EXEEXT)
103endif
98if EFL_ENABLE_COVERAGE 104if EFL_ENABLE_COVERAGE
99 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 105 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
100endif 106endif
diff --git a/configure.ac b/configure.ac
index d1bb640c61..a957637542 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,6 +196,9 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
196 196
197#### Additional options to configure 197#### Additional options to configure
198 198
199EFL_ENABLE_LIB([eet], [yes])
200
201
199# Assert or fail. 202# Assert or fail.
200 203
201AC_ARG_ENABLE([assert], 204AC_ARG_ENABLE([assert],
@@ -782,6 +785,10 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
782 785
783#### Eet 786#### Eet
784 787
788efl_have_eet="no"
789
790if test "x${efl_want_build_eet}" = "xyes" ; then
791
785AC_MSG_NOTICE([Eet checks]) 792AC_MSG_NOTICE([Eet checks])
786 793
787### Default values 794### Default values
@@ -1123,6 +1130,14 @@ esac
1123 1130
1124### Checks for library functions 1131### Checks for library functions
1125 1132
1133### Check availability
1134
1135if test "x${efl_lib_zlib}" = ""xyes" && test "x${efl_lib_libjpeg}" = ""xyes" ; then
1136 efl_have_eet="yes"
1137fi
1138
1139fi
1140
1126#### End of Eet 1141#### End of Eet
1127 1142
1128 1143
@@ -1246,6 +1261,9 @@ echo " Fixed bitmap.......: ${enable_fixed_bitmap}"
1246echo " One big............: ${enable_one_big}" 1261echo " One big............: ${enable_one_big}"
1247echo " Pass through.......: ${enable_pass_through}" 1262echo " Pass through.......: ${enable_pass_through}"
1248echo 1263echo
1264if test "x${efl_have_eet}" = "xno" ; then
1265echo "Eet....................: no"
1266else
1249echo "Eet" 1267echo "Eet"
1250echo 1268echo
1251echo " Secure layer.........: ${secure_layer}" 1269echo " Secure layer.........: ${secure_layer}"
@@ -1259,6 +1277,7 @@ echo
1259echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" 1277echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
1260echo " Examples.............: make examples" 1278echo " Examples.............: make examples"
1261echo " installation.......: make install-examples" 1279echo " installation.......: make install-examples"
1280fi
1262echo 1281echo
1263echo "Compilation............: make (or gmake)" 1282echo "Compilation............: make (or gmake)"
1264echo " CPPFLAGS.............: $CPPFLAGS" 1283echo " CPPFLAGS.............: $CPPFLAGS"
@@ -1269,4 +1288,3 @@ echo
1269echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" 1288echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
1270echo " prefix...............: $prefix" 1289echo " prefix...............: $prefix"
1271echo 1290echo
1272
diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
index fc2f200509..b4fb0ec126 100644
--- a/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
@@ -18,8 +18,8 @@ have_[]m4_defn([DOWN])="yes"
18 18
19dnl configure option 19dnl configure option
20 20
21AC_ARG_ENABLE([$1], 21AC_ARG_ENABLE([binary-$1],
22 [AC_HELP_STRING([--disable-$1], [disable building of ]DOWN)], 22 [AC_HELP_STRING([--disable-binary-$1], [disable building of ]DOWN[ binary])],
23 [ 23 [
24 if test "x${enableval}" = "xyes" ; then 24 if test "x${enableval}" = "xyes" ; then
25 have_[]m4_defn([DOWN])="yes" 25 have_[]m4_defn([DOWN])="yes"
@@ -37,8 +37,6 @@ fi
37 37
38AC_SUBST(UP[]_PRG) 38AC_SUBST(UP[]_PRG)
39 39
40AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes")
41
42AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3]) 40AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3])
43 41
44]) 42])
diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4
index ca30759d82..98dc0a1ba5 100644
--- a/m4/efl_compiler.m4
+++ b/m4/efl_compiler.m4
@@ -8,7 +8,6 @@ dnl Macro that checks for a compiler flag availability
8dnl 8dnl
9dnl EFL_CHECK_COMPILER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]]) 9dnl EFL_CHECK_COMPILER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
10dnl AC_SUBST : EFL_CFLAGS (EFL being replaced by its value) 10dnl AC_SUBST : EFL_CFLAGS (EFL being replaced by its value)
11dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
12 11
13AC_DEFUN([EFL_CHECK_COMPILER_FLAG], 12AC_DEFUN([EFL_CHECK_COMPILER_FLAG],
14[ 13[
@@ -39,8 +38,6 @@ fi
39AC_ARG_VAR(UPEFL[_CFLAGS], [preprocessor flags for $2]) 38AC_ARG_VAR(UPEFL[_CFLAGS], [preprocessor flags for $2])
40AC_SUBST(UPEFL[_CFLAGS]) 39AC_SUBST(UPEFL[_CFLAGS])
41 40
42AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
43
44m4_popdef([UP]) 41m4_popdef([UP])
45m4_popdef([UPEFL]) 42m4_popdef([UPEFL])
46]) 43])
@@ -60,7 +57,6 @@ dnl Macro that checks for a linker flag availability
60dnl 57dnl
61dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]]) 58dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
62dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value) 59dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value)
63dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
64 60
65AC_DEFUN([EFL_CHECK_LINKER_FLAG], 61AC_DEFUN([EFL_CHECK_LINKER_FLAG],
66[ 62[
@@ -88,8 +84,6 @@ fi
88AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2]) 84AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2])
89AC_SUBST(UPEFL[_LIBS]) 85AC_SUBST(UPEFL[_LIBS])
90 86
91AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
92
93m4_popdef([UP]) 87m4_popdef([UP])
94m4_popdef([UPEFL]) 88m4_popdef([UPEFL])
95]) 89])
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 70889282e3..0c72cbd210 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -8,4 +8,8 @@ SUBDIRS += evil
8 8
9endif 9endif
10 10
11if EFL_BUILD_EET
12
11SUBDIRS += eet 13SUBDIRS += eet
14
15endif
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 59a30d0509..abdebd74f9 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -4,8 +4,12 @@ SUBDIRS = eina eet
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
7if EFL_BUILD_EET
7 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples 8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
9endif
8 10
9install-examples: 11install-examples:
10 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 12 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
13if EFL_BUILD_EET
11 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples 14 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
15endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8522639495..24591e5676 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,4 +8,10 @@ SUBDIRS += evil
8 8
9endif 9endif
10 10
11SUBDIRS += eina eet 11SUBDIRS += eina
12
13if EFL_BUILD_EET
14
15SUBDIRS += eet
16
17endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 45fa7fe5f4..8d718c8085 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,3 +1,9 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina eet 3SUBDIRS = eina
4
5if EFL_BUILD_EET
6
7SUBDIRS += eet
8
9endif