summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-10-10 17:27:11 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-10-10 17:27:11 +0000
commit2703b747a36d81a75e373b4a4066bc179717592a (patch)
tree63b1c265e79a190ad70287209212feafdaf68b14 /Makefile.am
parent9ec7d338a2be6a9d26e9662a3dde55954c1f3019 (diff)
efl: eet and eo are now mandatory.
I've reordered the build to be: eina -> eo -> eet as it make more sense. SVN revision: 77766
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am19
1 files changed, 4 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index ba69d93fd3..527213986c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,15 +57,10 @@ if HAVE_WINDOWS
57pkgconfig_DATA += pc/evil.pc 57pkgconfig_DATA += pc/evil.pc
58endif 58endif
59 59
60pkgconfig_DATA += pc/eina.pc 60pkgconfig_DATA += \
61 61pc/eina.pc \
62if EFL_BUILD_EET 62pc/eo.pc \
63pkgconfig_DATA += pc/eet.pc 63pc/eet.pc
64endif
65
66if EFL_BUILD_EO
67pkgconfig_DATA += pc/eo.pc
68endif
69 64
70 65
71.PHONY: doc benchmark examples install-examples 66.PHONY: doc benchmark examples install-examples
@@ -100,12 +95,8 @@ check-local:
100if EFL_ENABLE_COVERAGE 95if EFL_ENABLE_COVERAGE
101 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 96 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
102endif 97endif
103if EFL_BUILD_EET
104 @./src/tests/eet/eet_suite$(EXEEXT) 98 @./src/tests/eet/eet_suite$(EXEEXT)
105endif
106if EFL_BUILD_EO
107 @./src/tests/eo/eo_suite$(EXEEXT) 99 @./src/tests/eo/eo_suite$(EXEEXT)
108endif
109if EFL_ENABLE_COVERAGE 100if EFL_ENABLE_COVERAGE
110 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 101 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
111endif 102endif
@@ -117,9 +108,7 @@ endif
117benchmark: 108benchmark:
118 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark 109 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
119 @mkdir benchmark || true 110 @mkdir benchmark || true
120if EFL_BUILD_EO
121 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` 111 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
122endif
123 112
124benchmark-e17: 113benchmark-e17:
125 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 114 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17