aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
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 /Makefile.am
parentand pass distcehck (diff)
downloadefl-a9230c1de31b6f99e49203ec6e294dd51c457cbb.tar.gz
make eo not an optional build - this WILL be no-option as we will be
based on it. SVN revision: 77124
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am15
1 files changed, 3 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index ba69d93fd3..1b94475271 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,20 +53,15 @@ pc/eo.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
+pkgconfig_DATA += pc/eina.pc pc/eo.pc
+
if HAVE_WINDOWS
pkgconfig_DATA += pc/evil.pc
endif
-
-pkgconfig_DATA += pc/eina.pc
-
if EFL_BUILD_EET
pkgconfig_DATA += pc/eet.pc
endif
-if EFL_BUILD_EO
-pkgconfig_DATA += pc/eo.pc
-endif
-
.PHONY: doc benchmark examples install-examples
@@ -100,12 +95,10 @@ check-local:
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
endif
+ @./src/tests/eo/eo_suite$(EXEEXT)
if EFL_BUILD_EET
@./src/tests/eet/eet_suite$(EXEEXT)
endif
-if EFL_BUILD_EO
- @./src/tests/eo/eo_suite$(EXEEXT)
-endif
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-report
endif
@@ -117,9 +110,7 @@ endif
benchmark:
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
@mkdir benchmark || true
-if EFL_BUILD_EO
@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
-endif
benchmark-e17:
@$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17