diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2012-09-26 06:56:52 +0000 |
|---|---|---|
| committer | Vincent Torri <vincent.torri@gmail.com> | 2012-09-26 06:56:52 +0000 |
| commit | 3b5a3448b7dfc53c2f129bdb04bea9f7a02741a6 (patch) | |
| tree | 18ad8a6b1841e9832c85a46f887b2cd6d6dacc4b /Makefile.am | |
| parent | 195d31c73fef88cfaa803b07b2ae3cba983a4093 (diff) | |
| download | efl-3b5a3448b7dfc53c2f129bdb04bea9f7a02741a6.tar.gz efl-3b5a3448b7dfc53c2f129bdb04bea9f7a02741a6.tar.xz efl-3b5a3448b7dfc53c2f129bdb04bea9f7a02741a6.zip | |
merge: add eo
SVN revision: 77072
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index a1f81df2e..e3f8375a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,15 +31,11 @@ m4/efl_threads.m4 \ m4/evil_windows.m4 \ m4/eina_check.m4 -if HAVE_WINDOWS EXTRA_DIST += \ ChangeLog.evil \ NEWS.evil \ README.evil \ -evil.pc -endif - -EXTRA_DIST += \ +evil.pc \ ChangeLog.eina \ NEWS.eina \ README.eina \ @@ -49,7 +45,8 @@ ChangeLog.eet \ NEWS.eet \ README.eet \ eet.spec \ -eet.pc +eet.pc \ +eo.pc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = @@ -64,6 +61,10 @@ if EFL_BUILD_EET pkgconfig_DATA += eet.pc endif +if EFL_BUILD_EO +pkgconfig_DATA += eo.pc +endif + .PHONY: doc benchmark examples install-examples @@ -97,10 +98,12 @@ check-local: if EFL_ENABLE_COVERAGE @$(MAKE) $(AM_MAKEFLAGS) lcov-reset endif - @./src/tests/eina/eina_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 @@ -112,7 +115,9 @@ endif benchmark: @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark @mkdir benchmark || true - @cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s` +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 |