summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am15
-rw-r--r--configure.ac115
-rw-r--r--src/benchmarks/Makefile.am2
-rw-r--r--src/examples/Makefile.am8
-rw-r--r--src/lib/Makefile.am14
-rw-r--r--src/tests/Makefile.am10
6 files changed, 57 insertions, 107 deletions
diff --git a/Makefile.am b/Makefile.am
index ba69d93fd3..1b94475271 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,20 +53,15 @@ pc/eo.pc
53pkgconfigdir = $(libdir)/pkgconfig 53pkgconfigdir = $(libdir)/pkgconfig
54pkgconfig_DATA = 54pkgconfig_DATA =
55 55
56pkgconfig_DATA += pc/eina.pc pc/eo.pc
57
56if HAVE_WINDOWS 58if HAVE_WINDOWS
57pkgconfig_DATA += pc/evil.pc 59pkgconfig_DATA += pc/evil.pc
58endif 60endif
59
60pkgconfig_DATA += pc/eina.pc
61
62if EFL_BUILD_EET 61if EFL_BUILD_EET
63pkgconfig_DATA += pc/eet.pc 62pkgconfig_DATA += pc/eet.pc
64endif 63endif
65 64
66if EFL_BUILD_EO
67pkgconfig_DATA += pc/eo.pc
68endif
69
70 65
71.PHONY: doc benchmark examples install-examples 66.PHONY: doc benchmark examples install-examples
72 67
@@ -100,12 +95,10 @@ check-local:
100if EFL_ENABLE_COVERAGE 95if EFL_ENABLE_COVERAGE
101 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 96 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
102endif 97endif
98 @./src/tests/eo/eo_suite$(EXEEXT)
103if EFL_BUILD_EET 99if EFL_BUILD_EET
104 @./src/tests/eet/eet_suite$(EXEEXT) 100 @./src/tests/eet/eet_suite$(EXEEXT)
105endif 101endif
106if EFL_BUILD_EO
107 @./src/tests/eo/eo_suite$(EXEEXT)
108endif
109if EFL_ENABLE_COVERAGE 102if EFL_ENABLE_COVERAGE
110 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 103 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
111endif 104endif
@@ -117,9 +110,7 @@ endif
117benchmark: 110benchmark:
118 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark 111 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
119 @mkdir benchmark || true 112 @mkdir benchmark || true
120if EFL_BUILD_EO
121 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` 113 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
122endif
123 114
124benchmark-e17: 115benchmark-e17:
125 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 116 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17
diff --git a/configure.ac b/configure.ac
index a065c005b7..ecd62286c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,8 +197,6 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
197#### Additional options to configure 197#### Additional options to configure
198 198
199EFL_ENABLE_LIB([eet], [yes]) 199EFL_ENABLE_LIB([eet], [yes])
200EFL_ENABLE_LIB([eo], [no])
201
202 200
203# Assert or fail. 201# Assert or fail.
204 202
@@ -784,6 +782,56 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
784#### End of Eina 782#### End of Eina
785 783
786 784
785#### Eo
786
787AC_MSG_NOTICE([Eo checks])
788
789### Default values
790
791### Additional options to configure
792
793### Checks for programs
794
795### Checks for libraries
796
797# Eina library
798
799requirements_pc_eo="eina >= 1.7.99"
800
801PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
802
803# Example (evas one)
804
805PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
806AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
807
808### Checks for header files
809
810### Checks for types
811
812### Checks for structures
813
814### Checks for compiler characteristics
815
816EFL_EO_BUILD=""
817case "$host_os" in
818 mingw*)
819 EFL_EO_BUILD="-DEFL_EO_BUILD"
820 ;;
821esac
822AC_SUBST([EFL_EO_BUILD])
823
824### Checks for linker characteristics
825
826### Checks for library functions
827
828### Check availability
829
830efl_have_eo="yes"
831
832#### End of Eo
833
834
787#### Eet 835#### Eet
788 836
789efl_have_eet="no" 837efl_have_eet="no"
@@ -1062,8 +1110,6 @@ AC_MSG_RESULT([${have_signature}])
1062 1110
1063EFL_CHECK_LIBS([EET], [libjpeg zlib]) 1111EFL_CHECK_LIBS([EET], [libjpeg zlib])
1064 1112
1065# Eina library
1066
1067requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}" 1113requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}"
1068 1114
1069PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}]) 1115PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
@@ -1141,67 +1187,6 @@ fi
1141 1187
1142#### End of Eet 1188#### End of Eet
1143 1189
1144
1145#### Eo
1146
1147efl_have_eo="no"
1148
1149if test "x${efl_want_build_eo}" = "xyes" ; then
1150
1151AC_MSG_NOTICE([Eo checks])
1152
1153### Default values
1154
1155### Additional options to configure
1156
1157### Checks for programs
1158
1159### Checks for libraries
1160
1161# Eina library
1162
1163requirements_pc_eo="eina >= 1.7.99"
1164
1165PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
1166
1167# Example (evas one)
1168
1169PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
1170AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
1171
1172### Checks for header files
1173
1174### Checks for types
1175
1176### Checks for structures
1177
1178### Checks for compiler characteristics
1179
1180EFL_EO_BUILD=""
1181case "$host_os" in
1182 mingw*)
1183 EFL_EO_BUILD="-DEFL_EO_BUILD"
1184 ;;
1185esac
1186AC_SUBST([EFL_EO_BUILD])
1187
1188### Checks for linker characteristics
1189
1190### Checks for library functions
1191
1192### Check availability
1193
1194efl_have_eo="yes"
1195
1196else
1197
1198AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false])
1199
1200fi
1201
1202#### End of Eo
1203
1204
1205#### Evas 1190#### Evas
1206 1191
1207#AC_MSG_NOTICE([Evas checks]) 1192#AC_MSG_NOTICE([Evas checks])
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am
index 15fa26cece..9ebb2ddd6b 100644
--- a/src/benchmarks/Makefile.am
+++ b/src/benchmarks/Makefile.am
@@ -6,9 +6,7 @@ SUBDIRS = eina eo
6 6
7benchmark: 7benchmark:
8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark 8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
9if EFL_BUILD_EO
10 @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark 9 @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark
11endif
12 10
13benchmark-e17: 11benchmark-e17:
14 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17 12 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 0a874138fb..94bea4e12a 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -4,18 +4,14 @@ SUBDIRS = eina eet eo
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
7 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
7if EFL_BUILD_EET 8if EFL_BUILD_EET
8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples 9 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
9endif 10endif
10if EFL_BUILD_EO
11 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
12endif
13 11
14install-examples: 12install-examples:
15 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 13 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
14 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
16if EFL_BUILD_EET 15if EFL_BUILD_EET
17 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples 16 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
18endif 17endif
19if EFL_BUILD_EO
20 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
21endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e715faa107..18623daf73 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,23 +1,11 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = 3SUBDIRS = eina eo
4 4
5if HAVE_WINDOWS 5if HAVE_WINDOWS
6
7SUBDIRS += evil 6SUBDIRS += evil
8
9endif 7endif
10 8
11SUBDIRS += eina
12
13if EFL_BUILD_EET 9if EFL_BUILD_EET
14
15SUBDIRS += eet 10SUBDIRS += eet
16
17endif
18
19if EFL_BUILD_EO
20
21SUBDIRS += eo
22
23endif 11endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 4598ce34a7..e193b85ac8 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,15 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina 3SUBDIRS = eina eo
4 4
5if EFL_BUILD_EET 5if EFL_BUILD_EET
6
7SUBDIRS += eet 6SUBDIRS += eet
8
9endif
10
11if EFL_BUILD_EO
12
13SUBDIRS += eo
14
15endif 7endif