summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-23 19:56:44 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-23 19:56:44 +0000
commit851975dbcccdf4c70689a9d8c2fa7359fb6cc89e (patch)
treeca1fad45795a8d325c706681334c9df3d301d50c /Makefile.am
parent58f5ec5047fcc32540176c3d4f0f4e3b959fddea (diff)
merge : remove useless CONDITIONALs and make eet build optional; eina is always built
SVN revision: 77026
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index c1a9b4507c..a1f81df2ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,11 @@ if HAVE_WINDOWS
58pkgconfig_DATA += evil.pc 58pkgconfig_DATA += evil.pc
59endif 59endif
60 60
61pkgconfig_DATA += eina.pc eet.pc 61pkgconfig_DATA += eina.pc
62
63if EFL_BUILD_EET
64pkgconfig_DATA += eet.pc
65endif
62 66
63 67
64.PHONY: doc benchmark examples install-examples 68.PHONY: doc benchmark examples install-examples
@@ -94,7 +98,9 @@ if EFL_ENABLE_COVERAGE
94 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 98 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
95endif 99endif
96 @./src/tests/eina/eina_suite$(EXEEXT) 100 @./src/tests/eina/eina_suite$(EXEEXT)
101if EFL_BUILD_EET
97 @./src/tests/eet/eet_suite$(EXEEXT) 102 @./src/tests/eet/eet_suite$(EXEEXT)
103endif
98if EFL_ENABLE_COVERAGE 104if EFL_ENABLE_COVERAGE
99 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 105 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
100endif 106endif