merge : remove useless CONDITIONALs and make eet build optional; eina is always built

SVN revision: 77026

4 files changed, 22 insertions, 2 deletions

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
 
 endif
 
+if EFL_BUILD_EET
+
 SUBDIRS += eet
+
+endif
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
 
 examples:
         @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
+if EFL_BUILD_EET
         @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
+endif
 
 install-examples:
         @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
+if EFL_BUILD_EET
         @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
+endif
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
 
 endif
 
-SUBDIRS += eina eet
+SUBDIRS += eina
+
+if EFL_BUILD_EET
+
+SUBDIRS += eet
+
+endif
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 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = eina eet
+SUBDIRS = eina
+
+if EFL_BUILD_EET
+
+SUBDIRS += eet
+
+endif