aboutsummaryrefslogtreecommitdiffstats
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 ba69d93fd..1b9447527 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,20 +53,15 @@ pc/eo.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
+pkgconfig_DATA += pc/eina.pc pc/eo.pc
+
if HAVE_WINDOWS
pkgconfig_DATA += pc/evil.pc
endif
-
-pkgconfig_DATA += pc/eina.pc
-
if EFL_BUILD_EET
pkgconfig_DATA += pc/eet.pc
endif
-if EFL_BUILD_EO
-pkgconfig_DATA += pc/eo.pc
-endif
-
.PHONY: doc benchmark examples install-examples
@@ -100,12 +95,10 @@ check-local:
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
endif
+ @./src/tests/eo/eo_suite$(EXEEXT)
if EFL_BUILD_EET
@./src/tests/eet/eet_suite$(EXEEXT)
endif
-if EFL_BUILD_EO
- @./src/tests/eo/eo_suite$(EXEEXT)
-endif
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-report
endif
@@ -117,9 +110,7 @@ endif
benchmark:
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
@mkdir benchmark || true
-if EFL_BUILD_EO
@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
-endif
benchmark-e17:
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17
diff --git a/configure.ac b/configure.ac
index a065c005b..ecd62286c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,8 +197,6 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
#### Additional options to configure
EFL_ENABLE_LIB([eet], [yes])
-EFL_ENABLE_LIB([eo], [no])
-
# Assert or fail.
@@ -784,6 +782,56 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
#### End of Eina
+#### Eo
+
+AC_MSG_NOTICE([Eo checks])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+
+# Eina library
+
+requirements_pc_eo="eina >= 1.7.99"
+
+PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
+
+# Example (evas one)
+
+PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
+AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+EFL_EO_BUILD=""
+case "$host_os" in
+ mingw*)
+ EFL_EO_BUILD="-DEFL_EO_BUILD"
+ ;;
+esac
+AC_SUBST([EFL_EO_BUILD])
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+efl_have_eo="yes"
+
+#### End of Eo
+
+
#### Eet
efl_have_eet="no"
@@ -1062,8 +1110,6 @@ AC_MSG_RESULT([${have_signature}])
EFL_CHECK_LIBS([EET], [libjpeg zlib])
-# Eina library
-
requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}"
PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
@@ -1141,67 +1187,6 @@ fi
#### End of Eet
-
-#### Eo
-
-efl_have_eo="no"
-
-if test "x${efl_want_build_eo}" = "xyes" ; then
-
-AC_MSG_NOTICE([Eo checks])
-
-### Default values
-
-### Additional options to configure
-
-### Checks for programs
-
-### Checks for libraries
-
-# Eina library
-
-requirements_pc_eo="eina >= 1.7.99"
-
-PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
-
-# Example (evas one)
-
-PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
-AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
-
-### Checks for header files
-
-### Checks for types
-
-### Checks for structures
-
-### Checks for compiler characteristics
-
-EFL_EO_BUILD=""
-case "$host_os" in
- mingw*)
- EFL_EO_BUILD="-DEFL_EO_BUILD"
- ;;
-esac
-AC_SUBST([EFL_EO_BUILD])
-
-### Checks for linker characteristics
-
-### Checks for library functions
-
-### Check availability
-
-efl_have_eo="yes"
-
-else
-
-AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false])
-
-fi
-
-#### End of Eo
-
-
#### Evas
#AC_MSG_NOTICE([Evas checks])
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am
index 15fa26cec..9ebb2ddd6 100644
--- a/src/benchmarks/Makefile.am
+++ b/src/benchmarks/Makefile.am
@@ -6,9 +6,7 @@ SUBDIRS = eina eo
benchmark:
@$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
-if EFL_BUILD_EO
@$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark
-endif
benchmark-e17:
@$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 0a874138f..94bea4e12 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -4,18 +4,14 @@ SUBDIRS = eina eet eo
examples:
@$(MAKE) $(AM_MAKEFLAGS) -C eina examples
+ @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
if EFL_BUILD_EET
@$(MAKE) $(AM_MAKEFLAGS) -C eet examples
endif
-if EFL_BUILD_EO
- @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
-endif
install-examples:
@$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
+ @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
if EFL_BUILD_EET
@$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
endif
-if EFL_BUILD_EO
- @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
-endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e715faa10..18623daf7 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,23 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS =
+SUBDIRS = eina eo
if HAVE_WINDOWS
-
SUBDIRS += evil
-
endif
-SUBDIRS += eina
-
if EFL_BUILD_EET
-
SUBDIRS += eet
-
-endif
-
-if EFL_BUILD_EO
-
-SUBDIRS += eo
-
endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 4598ce34a..e193b85ac 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,15 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = eina
+SUBDIRS = eina eo
if EFL_BUILD_EET
-
SUBDIRS += eet
-
-endif
-
-if EFL_BUILD_EO
-
-SUBDIRS += eo
-
endif