summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-09-27 04:39:28 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-09-27 04:39:28 +0000
commita9230c1de31b6f99e49203ec6e294dd51c457cbb (patch)
treeb5c4d8ecfd424c068ab2f1612f280734f0add923 /src
parent8eb2fc8c4ffb519e939c85796e634e06317e1384 (diff)
make eo not an optional build - this WILL be no-option as we will be
based on it. SVN revision: 77124
Diffstat (limited to 'src')
-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
4 files changed, 4 insertions, 30 deletions
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
6 6
7benchmark: 7benchmark:
8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark 8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
9if EFL_BUILD_EO
10 @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark 9 @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark
11endif
12 10
13benchmark-e17: 11benchmark-e17:
14 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17 12 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 0a874138fb..94bea4e12a 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -4,18 +4,14 @@ SUBDIRS = eina eet eo
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
7 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
7if EFL_BUILD_EET 8if EFL_BUILD_EET
8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples 9 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
9endif 10endif
10if EFL_BUILD_EO
11 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
12endif
13 11
14install-examples: 12install-examples:
15 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 13 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
14 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
16if EFL_BUILD_EET 15if EFL_BUILD_EET
17 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples 16 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
18endif 17endif
19if EFL_BUILD_EO
20 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
21endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e715faa107..18623daf73 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,23 +1,11 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = 3SUBDIRS = eina eo
4 4
5if HAVE_WINDOWS 5if HAVE_WINDOWS
6
7SUBDIRS += evil 6SUBDIRS += evil
8
9endif 7endif
10 8
11SUBDIRS += eina
12
13if EFL_BUILD_EET 9if EFL_BUILD_EET
14
15SUBDIRS += eet 10SUBDIRS += eet
16
17endif
18
19if EFL_BUILD_EO
20
21SUBDIRS += eo
22
23endif 11endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 4598ce34a7..e193b85ac8 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,15 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina 3SUBDIRS = eina eo
4 4
5if EFL_BUILD_EET 5if EFL_BUILD_EET
6
7SUBDIRS += eet 6SUBDIRS += eet
8
9endif
10
11if EFL_BUILD_EO
12
13SUBDIRS += eo
14
15endif 7endif