diff options
| author | Carsten Haitzler <raster@rasterman.com> | 2012-09-27 04:39:28 +0000 |
|---|---|---|
| committer | Carsten Haitzler <raster@rasterman.com> | 2012-09-27 04:39:28 +0000 |
| commit | a9230c1de31b6f99e49203ec6e294dd51c457cbb (patch) | |
| tree | b5c4d8ecfd424c068ab2f1612f280734f0add923 /src | |
| parent | 8eb2fc8c4ffb519e939c85796e634e06317e1384 (diff) | |
| download | efl-a9230c1de31b6f99e49203ec6e294dd51c457cbb.tar.gz efl-a9230c1de31b6f99e49203ec6e294dd51c457cbb.tar.xz efl-a9230c1de31b6f99e49203ec6e294dd51c457cbb.zip | |
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.am | 2 | ||||
| -rw-r--r-- | src/examples/Makefile.am | 8 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 14 | ||||
| -rw-r--r-- | src/tests/Makefile.am | 10 |
4 files changed, 4 insertions, 30 deletions
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am index 15fa26cec..9ebb2ddd6 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/examples/Makefile.am b/src/examples/Makefile.am index 0a874138f..94bea4e12 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -4,18 +4,14 @@ SUBDIRS = eina eet eo examples: @$(MAKE) $(AM_MAKEFLAGS) -C eina examples + @$(MAKE) $(AM_MAKEFLAGS) -C eo examples if EFL_BUILD_EET @$(MAKE) $(AM_MAKEFLAGS) -C eet examples endif -if EFL_BUILD_EO - @$(MAKE) $(AM_MAKEFLAGS) -C eo examples -endif install-examples: @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples + @$(MAKE) $(AM_MAKEFLAGS) -C eo 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 diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index e715faa10..18623daf7 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,23 +1,11 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = +SUBDIRS = eina eo if HAVE_WINDOWS - SUBDIRS += evil - endif -SUBDIRS += eina - if EFL_BUILD_EET - SUBDIRS += eet - -endif - -if EFL_BUILD_EO - -SUBDIRS += eo - endif diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 4598ce34a..e193b85ac 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,15 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = eina +SUBDIRS = eina eo if EFL_BUILD_EET - SUBDIRS += eet - -endif - -if EFL_BUILD_EO - -SUBDIRS += eo - endif |