summaryrefslogtreecommitdiff
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
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 '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
53pkgconfigdir = $(libdir)/pkgconfig 53pkgconfigdir = $(libdir)/pkgconfig
54pkgconfig_DATA = 54pkgconfig_DATA =
55 55
56pkgconfig_DATA += pc/eina.pc pc/eo.pc
57
56if HAVE_WINDOWS 58if HAVE_WINDOWS
57pkgconfig_DATA += pc/evil.pc 59pkgconfig_DATA += pc/evil.pc
58endif 60endif
59
60pkgconfig_DATA += pc/eina.pc
61
62if EFL_BUILD_EET 61if EFL_BUILD_EET
63pkgconfig_DATA += pc/eet.pc 62pkgconfig_DATA += pc/eet.pc
64endif 63endif
65 64
66if EFL_BUILD_EO
67pkgconfig_DATA += pc/eo.pc
68endif
69
70 65
71.PHONY: doc benchmark examples install-examples 66.PHONY: doc benchmark examples install-examples
72 67
@@ -100,12 +95,10 @@ check-local:
100if EFL_ENABLE_COVERAGE 95if EFL_ENABLE_COVERAGE
101 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 96 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
102endif 97endif
98 @./src/tests/eo/eo_suite$(EXEEXT)
103if EFL_BUILD_EET 99if EFL_BUILD_EET
104 @./src/tests/eet/eet_suite$(EXEEXT) 100 @./src/tests/eet/eet_suite$(EXEEXT)
105endif 101endif
106if EFL_BUILD_EO
107 @./src/tests/eo/eo_suite$(EXEEXT)
108endif
109if EFL_ENABLE_COVERAGE 102if EFL_ENABLE_COVERAGE
110 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 103 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
111endif 104endif
@@ -117,9 +110,7 @@ endif
117benchmark: 110benchmark:
118 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark 111 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
119 @mkdir benchmark || true 112 @mkdir benchmark || true
120if EFL_BUILD_EO
121 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` 113 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
122endif
123 114
124benchmark-e17: 115benchmark-e17:
125 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 116 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17