summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am19
-rw-r--r--configure.ac14
-rw-r--r--src/benchmarks/Makefile.am2
-rw-r--r--src/bin/Makefile.am4
-rw-r--r--src/examples/Makefile.am14
-rw-r--r--src/lib/Makefile.am14
-rw-r--r--src/tests/Makefile.am14
7 files changed, 9 insertions, 72 deletions
diff --git a/Makefile.am b/Makefile.am
index ba69d93fd3..527213986c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,15 +57,10 @@ if HAVE_WINDOWS
57pkgconfig_DATA += pc/evil.pc 57pkgconfig_DATA += pc/evil.pc
58endif 58endif
59 59
60pkgconfig_DATA += pc/eina.pc 60pkgconfig_DATA += \
61 61pc/eina.pc \
62if EFL_BUILD_EET 62pc/eo.pc \
63pkgconfig_DATA += pc/eet.pc 63pc/eet.pc
64endif
65
66if EFL_BUILD_EO
67pkgconfig_DATA += pc/eo.pc
68endif
69 64
70 65
71.PHONY: doc benchmark examples install-examples 66.PHONY: doc benchmark examples install-examples
@@ -100,12 +95,8 @@ check-local:
100if EFL_ENABLE_COVERAGE 95if EFL_ENABLE_COVERAGE
101 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 96 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
102endif 97endif
103if EFL_BUILD_EET
104 @./src/tests/eet/eet_suite$(EXEEXT) 98 @./src/tests/eet/eet_suite$(EXEEXT)
105endif
106if EFL_BUILD_EO
107 @./src/tests/eo/eo_suite$(EXEEXT) 99 @./src/tests/eo/eo_suite$(EXEEXT)
108endif
109if EFL_ENABLE_COVERAGE 100if EFL_ENABLE_COVERAGE
110 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 101 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
111endif 102endif
@@ -117,9 +108,7 @@ endif
117benchmark: 108benchmark:
118 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark 109 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
119 @mkdir benchmark || true 110 @mkdir benchmark || true
120if EFL_BUILD_EO
121 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` 111 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
122endif
123 112
124benchmark-e17: 113benchmark-e17:
125 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 114 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17
diff --git a/configure.ac b/configure.ac
index 4936c3a1f8..0aa9da4628 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,8 +196,6 @@ 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])
200EFL_ENABLE_LIB([eo], [yes])
201 199
202 200
203# Assert or fail. 201# Assert or fail.
@@ -787,8 +785,6 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
787 785
788efl_have_eet="no" 786efl_have_eet="no"
789 787
790if test "x${efl_want_build_eet}" = "xyes" ; then
791
792AC_MSG_NOTICE([Eet checks]) 788AC_MSG_NOTICE([Eet checks])
793 789
794### Default values 790### Default values
@@ -1136,8 +1132,6 @@ if test "x${efl_lib_zlib}" = "xyes" && test "x${efl_lib_libjpeg}" = "xyes" ; the
1136 efl_have_eet="yes" 1132 efl_have_eet="yes"
1137fi 1133fi
1138 1134
1139fi
1140
1141#### End of Eet 1135#### End of Eet
1142 1136
1143 1137
@@ -1145,8 +1139,6 @@ fi
1145 1139
1146efl_have_eo="no" 1140efl_have_eo="no"
1147 1141
1148if test "x${efl_want_build_eo}" = "xyes" ; then
1149
1150AC_MSG_NOTICE([Eo checks]) 1142AC_MSG_NOTICE([Eo checks])
1151 1143
1152### Default values 1144### Default values
@@ -1195,12 +1187,6 @@ AC_SUBST([EFL_EO_BUILD])
1195 1187
1196efl_have_eo="yes" 1188efl_have_eo="yes"
1197 1189
1198else
1199
1200AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false])
1201
1202fi
1203
1204#### End of Eo 1190#### End of Eo
1205 1191
1206 1192
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/bin/Makefile.am b/src/bin/Makefile.am
index 0c72cbd210..70889282e3 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -8,8 +8,4 @@ SUBDIRS += evil
8 8
9endif 9endif
10 10
11if EFL_BUILD_EET
12
13SUBDIRS += eet 11SUBDIRS += eet
14
15endif
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 0a874138fb..9b095d82c2 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,21 +1,13 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina eet eo 3SUBDIRS = eina eo eet
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
7if EFL_BUILD_EET
8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
9endif
10if EFL_BUILD_EO
11 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples 7 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
12endif 8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
13 9
14install-examples: 10install-examples:
15 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 11 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
16if EFL_BUILD_EET
17 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
18endif
19if EFL_BUILD_EO
20 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples 12 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
21endif 13 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e715faa107..755365ab10 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,16 +8,4 @@ SUBDIRS += evil
8 8
9endif 9endif
10 10
11SUBDIRS += eina 11SUBDIRS += eina eo eet
12
13if EFL_BUILD_EET
14
15SUBDIRS += eet
16
17endif
18
19if EFL_BUILD_EO
20
21SUBDIRS += eo
22
23endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 4598ce34a7..8efa21a430 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,15 +1,3 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina 3SUBDIRS = eina eo eet
4
5if EFL_BUILD_EET
6
7SUBDIRS += eet
8
9endif
10
11if EFL_BUILD_EO
12
13SUBDIRS += eo
14
15endif