From 2703b747a36d81a75e373b4a4066bc179717592a Mon Sep 17 00:00:00 2001
From: Gustavo Sverzut Barbieri <barbieri@gmail.com>
Date: Wed, 10 Oct 2012 17:27:11 +0000
Subject: [PATCH] efl: eet and eo are now mandatory.

I've reordered the build to be: eina -> eo -> eet as it make more sense.



SVN revision: 77766
---
 Makefile.am                | 19 ++++---------------
 configure.ac               | 14 --------------
 src/benchmarks/Makefile.am |  2 --
 src/bin/Makefile.am        |  4 ----
 src/examples/Makefile.am   | 14 +++-----------
 src/lib/Makefile.am        | 14 +-------------
 src/tests/Makefile.am      | 14 +-------------
 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
 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
+pkgconfig_DATA += \
+pc/eina.pc \
+pc/eo.pc \
+pc/eet.pc
 
 
 .PHONY: doc benchmark examples install-examples
@@ -100,12 +95,8 @@ check-local:
 if EFL_ENABLE_COVERAGE
 	@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
 endif
-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 +108,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 4936c3a1f8..0aa9da4628 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,8 +196,6 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
 
 #### Additional options to configure
 
-EFL_ENABLE_LIB([eet], [yes])
-EFL_ENABLE_LIB([eo], [yes])
 
 
 # Assert or fail.
@@ -787,8 +785,6 @@ EINA_CHECK_MODULE([one-big],        [${enable_one_big}],      [one big])
 
 efl_have_eet="no"
 
-if test "x${efl_want_build_eet}" = "xyes" ; then
-
 AC_MSG_NOTICE([Eet checks])
 
 ### Default values
@@ -1136,8 +1132,6 @@ if test "x${efl_lib_zlib}" = "xyes" && test "x${efl_lib_libjpeg}" = "xyes" ; the
    efl_have_eet="yes"
 fi
 
-fi
-
 #### End of Eet
 
 
@@ -1145,8 +1139,6 @@ fi
 
 efl_have_eo="no"
 
-if test "x${efl_want_build_eo}" = "xyes" ; then
-
 AC_MSG_NOTICE([Eo checks])
 
 ### Default values
@@ -1195,12 +1187,6 @@ AC_SUBST([EFL_EO_BUILD])
 
 efl_have_eo="yes"
 
-else
-
-AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false])
-
-fi
-
 #### End of Eo
 
 
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
 
 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/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
 
 endif
 
-if EFL_BUILD_EET
-
 SUBDIRS += eet
-
-endif
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 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = eina eet eo
+SUBDIRS = eina eo eet
 
 examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C eina examples
-if EFL_BUILD_EET
-	@$(MAKE) $(AM_MAKEFLAGS) -C eet examples
-endif
-if EFL_BUILD_EO
 	@$(MAKE) $(AM_MAKEFLAGS) -C eo examples
-endif
+	@$(MAKE) $(AM_MAKEFLAGS) -C eet examples
 
 install-examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C eina 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
+	@$(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
 
 endif
 
-SUBDIRS += eina
-
-if EFL_BUILD_EET
-
-SUBDIRS += eet
-
-endif
-
-if EFL_BUILD_EO
-
-SUBDIRS += eo
-
-endif
+SUBDIRS += eina eo eet
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 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = eina
-
-if EFL_BUILD_EET
-
-SUBDIRS += eet
-
-endif
-
-if EFL_BUILD_EO
-
-SUBDIRS += eo
-
-endif
+SUBDIRS = eina eo eet