aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-23 19:56:44 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-23 19:56:44 +0000
commit851975dbcccdf4c70689a9d8c2fa7359fb6cc89e (patch)
treeca1fad45795a8d325c706681334c9df3d301d50c /src
parent58f5ec5047fcc32540176c3d4f0f4e3b959fddea (diff)
downloadefl-851975dbcccdf4c70689a9d8c2fa7359fb6cc89e.tar.gz
efl-851975dbcccdf4c70689a9d8c2fa7359fb6cc89e.tar.xz
efl-851975dbcccdf4c70689a9d8c2fa7359fb6cc89e.zip
merge : remove useless CONDITIONALs and make eet build optional; eina is always built
SVN revision: 77026
Diffstat (limited to 'src')
-rw-r--r--src/bin/Makefile.am4
-rw-r--r--src/examples/Makefile.am4
-rw-r--r--src/lib/Makefile.am8
-rw-r--r--src/tests/Makefile.am8
4 files changed, 22 insertions, 2 deletions
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 70889282e..0c72cbd21 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 59a30d050..abdebd74f 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 852263949..24591e567 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 45fa7fe5f..8d718c808 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