summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-26 06:56:52 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-26 06:56:52 +0000
commit3b5a3448b7dfc53c2f129bdb04bea9f7a02741a6 (patch)
tree18ad8a6b1841e9832c85a46f887b2cd6d6dacc4b /Makefile.am
parent195d31c73fef88cfaa803b07b2ae3cba983a4093 (diff)
merge: add eo
SVN revision: 77072
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am21
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index a1f81df2ef..e3f8375a83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,15 +31,11 @@ m4/efl_threads.m4 \
31m4/evil_windows.m4 \ 31m4/evil_windows.m4 \
32m4/eina_check.m4 32m4/eina_check.m4
33 33
34if HAVE_WINDOWS
35EXTRA_DIST += \ 34EXTRA_DIST += \
36ChangeLog.evil \ 35ChangeLog.evil \
37NEWS.evil \ 36NEWS.evil \
38README.evil \ 37README.evil \
39evil.pc 38evil.pc \
40endif
41
42EXTRA_DIST += \
43ChangeLog.eina \ 39ChangeLog.eina \
44NEWS.eina \ 40NEWS.eina \
45README.eina \ 41README.eina \
@@ -49,7 +45,8 @@ ChangeLog.eet \
49NEWS.eet \ 45NEWS.eet \
50README.eet \ 46README.eet \
51eet.spec \ 47eet.spec \
52eet.pc 48eet.pc \
49eo.pc
53 50
54pkgconfigdir = $(libdir)/pkgconfig 51pkgconfigdir = $(libdir)/pkgconfig
55pkgconfig_DATA = 52pkgconfig_DATA =
@@ -64,6 +61,10 @@ if EFL_BUILD_EET
64pkgconfig_DATA += eet.pc 61pkgconfig_DATA += eet.pc
65endif 62endif
66 63
64if EFL_BUILD_EO
65pkgconfig_DATA += eo.pc
66endif
67
67 68
68.PHONY: doc benchmark examples install-examples 69.PHONY: doc benchmark examples install-examples
69 70
@@ -97,10 +98,12 @@ check-local:
97if EFL_ENABLE_COVERAGE 98if EFL_ENABLE_COVERAGE
98 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 99 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
99endif 100endif
100 @./src/tests/eina/eina_suite$(EXEEXT)
101if EFL_BUILD_EET 101if EFL_BUILD_EET
102 @./src/tests/eet/eet_suite$(EXEEXT) 102 @./src/tests/eet/eet_suite$(EXEEXT)
103endif 103endif
104if EFL_BUILD_EO
105 @./src/tests/eo/eo_suite$(EXEEXT)
106endif
104if EFL_ENABLE_COVERAGE 107if EFL_ENABLE_COVERAGE
105 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 108 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
106endif 109endif
@@ -112,7 +115,9 @@ endif
112benchmark: 115benchmark:
113 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark 116 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
114 @mkdir benchmark || true 117 @mkdir benchmark || true
115 @cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s` 118if EFL_BUILD_EO
119 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
120endif
116 121
117benchmark-e17: 122benchmark-e17:
118 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 123 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17