diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-09-27 04:46:30 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-09-27 04:46:30 +0000 |
commit | 0951e8a9d1618eeef063d5859848aff8aab63432 (patch) | |
tree | d91fd945b177895499ae99799214c1c0dd18ad3a /Makefile.am | |
parent | cfafa2dd72317fe7d596bd4cd7ba11fc0cbbb253 (diff) |
Eo IS optional. Sorry, i will fight to have ALL libs being optional
SVN revision: 77126
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 1b94475271..ba69d93fd3 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -53,15 +53,20 @@ pc/eo.pc | |||
53 | pkgconfigdir = $(libdir)/pkgconfig | 53 | pkgconfigdir = $(libdir)/pkgconfig |
54 | pkgconfig_DATA = | 54 | pkgconfig_DATA = |
55 | 55 | ||
56 | pkgconfig_DATA += pc/eina.pc pc/eo.pc | ||
57 | |||
58 | if HAVE_WINDOWS | 56 | if HAVE_WINDOWS |
59 | pkgconfig_DATA += pc/evil.pc | 57 | pkgconfig_DATA += pc/evil.pc |
60 | endif | 58 | endif |
59 | |||
60 | pkgconfig_DATA += pc/eina.pc | ||
61 | |||
61 | if EFL_BUILD_EET | 62 | if EFL_BUILD_EET |
62 | pkgconfig_DATA += pc/eet.pc | 63 | pkgconfig_DATA += pc/eet.pc |
63 | endif | 64 | endif |
64 | 65 | ||
66 | if EFL_BUILD_EO | ||
67 | pkgconfig_DATA += pc/eo.pc | ||
68 | endif | ||
69 | |||
65 | 70 | ||
66 | .PHONY: doc benchmark examples install-examples | 71 | .PHONY: doc benchmark examples install-examples |
67 | 72 | ||
@@ -95,10 +100,12 @@ check-local: | |||
95 | if EFL_ENABLE_COVERAGE | 100 | if EFL_ENABLE_COVERAGE |
96 | @$(MAKE) $(AM_MAKEFLAGS) lcov-reset | 101 | @$(MAKE) $(AM_MAKEFLAGS) lcov-reset |
97 | endif | 102 | endif |
98 | @./src/tests/eo/eo_suite$(EXEEXT) | ||
99 | if EFL_BUILD_EET | 103 | if EFL_BUILD_EET |
100 | @./src/tests/eet/eet_suite$(EXEEXT) | 104 | @./src/tests/eet/eet_suite$(EXEEXT) |
101 | endif | 105 | endif |
106 | if EFL_BUILD_EO | ||
107 | @./src/tests/eo/eo_suite$(EXEEXT) | ||
108 | endif | ||
102 | if EFL_ENABLE_COVERAGE | 109 | if EFL_ENABLE_COVERAGE |
103 | @$(MAKE) $(AM_MAKEFLAGS) lcov-report | 110 | @$(MAKE) $(AM_MAKEFLAGS) lcov-report |
104 | endif | 111 | endif |
@@ -110,7 +117,9 @@ endif | |||
110 | benchmark: | 117 | benchmark: |
111 | @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark | 118 | @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark |
112 | @mkdir benchmark || true | 119 | @mkdir benchmark || true |
120 | if EFL_BUILD_EO | ||
113 | @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` | 121 | @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` |
122 | endif | ||
114 | 123 | ||
115 | benchmark-e17: | 124 | benchmark-e17: |
116 | @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 | 125 | @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 |