summaryrefslogtreecommitdiff
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)
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 70889282e3..0c72cbd210 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -8,4 +8,8 @@ SUBDIRS += evil
8 8
9endif 9endif
10 10
11if EFL_BUILD_EET
12
11SUBDIRS += eet 13SUBDIRS += eet
14
15endif
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
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
7if EFL_BUILD_EET
7 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples 8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
9endif
8 10
9install-examples: 11install-examples:
10 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 12 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
13if EFL_BUILD_EET
11 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples 14 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
15endif
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
8 8
9endif 9endif
10 10
11SUBDIRS += eina eet 11SUBDIRS += eina
12
13if EFL_BUILD_EET
14
15SUBDIRS += eet
16
17endif
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 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina eet 3SUBDIRS = eina
4
5if EFL_BUILD_EET
6
7SUBDIRS += eet
8
9endif