summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-27 04:46:30 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-27 04:46:30 +0000
commit0951e8a9d1618eeef063d5859848aff8aab63432 (patch)
treed91fd945b177895499ae99799214c1c0dd18ad3a
parentcfafa2dd72317fe7d596bd4cd7ba11fc0cbbb253 (diff)
Eo IS optional. Sorry, i will fight to have ALL libs being optional
SVN revision: 77126
-rw-r--r--Makefile.am15
-rw-r--r--configure.ac115
-rw-r--r--src/benchmarks/Makefile.am2
-rw-r--r--src/examples/Makefile.am8
-rw-r--r--src/lib/Makefile.am14
-rw-r--r--src/tests/Makefile.am10
6 files changed, 107 insertions, 57 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
53pkgconfigdir = $(libdir)/pkgconfig 53pkgconfigdir = $(libdir)/pkgconfig
54pkgconfig_DATA = 54pkgconfig_DATA =
55 55
56pkgconfig_DATA += pc/eina.pc pc/eo.pc
57
58if HAVE_WINDOWS 56if HAVE_WINDOWS
59pkgconfig_DATA += pc/evil.pc 57pkgconfig_DATA += pc/evil.pc
60endif 58endif
59
60pkgconfig_DATA += pc/eina.pc
61
61if EFL_BUILD_EET 62if EFL_BUILD_EET
62pkgconfig_DATA += pc/eet.pc 63pkgconfig_DATA += pc/eet.pc
63endif 64endif
64 65
66if EFL_BUILD_EO
67pkgconfig_DATA += pc/eo.pc
68endif
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:
95if EFL_ENABLE_COVERAGE 100if EFL_ENABLE_COVERAGE
96 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 101 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
97endif 102endif
98 @./src/tests/eo/eo_suite$(EXEEXT)
99if EFL_BUILD_EET 103if EFL_BUILD_EET
100 @./src/tests/eet/eet_suite$(EXEEXT) 104 @./src/tests/eet/eet_suite$(EXEEXT)
101endif 105endif
106if EFL_BUILD_EO
107 @./src/tests/eo/eo_suite$(EXEEXT)
108endif
102if EFL_ENABLE_COVERAGE 109if EFL_ENABLE_COVERAGE
103 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 110 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
104endif 111endif
@@ -110,7 +117,9 @@ endif
110benchmark: 117benchmark:
111 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark 118 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
112 @mkdir benchmark || true 119 @mkdir benchmark || true
120if 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`
122endif
114 123
115benchmark-e17: 124benchmark-e17:
116 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 125 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17
diff --git a/configure.ac b/configure.ac
index ecd62286c2..a065c005b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,6 +197,8 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
197#### Additional options to configure 197#### Additional options to configure
198 198
199EFL_ENABLE_LIB([eet], [yes]) 199EFL_ENABLE_LIB([eet], [yes])
200EFL_ENABLE_LIB([eo], [no])
201
200 202
201# Assert or fail. 203# Assert or fail.
202 204
@@ -782,56 +784,6 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
782#### End of Eina 784#### End of Eina
783 785
784 786
785#### Eo
786
787AC_MSG_NOTICE([Eo checks])
788
789### Default values
790
791### Additional options to configure
792
793### Checks for programs
794
795### Checks for libraries
796
797# Eina library
798
799requirements_pc_eo="eina >= 1.7.99"
800
801PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
802
803# Example (evas one)
804
805PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
806AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
807
808### Checks for header files
809
810### Checks for types
811
812### Checks for structures
813
814### Checks for compiler characteristics
815
816EFL_EO_BUILD=""
817case "$host_os" in
818 mingw*)
819 EFL_EO_BUILD="-DEFL_EO_BUILD"
820 ;;
821esac
822AC_SUBST([EFL_EO_BUILD])
823
824### Checks for linker characteristics
825
826### Checks for library functions
827
828### Check availability
829
830efl_have_eo="yes"
831
832#### End of Eo
833
834
835#### Eet 787#### Eet
836 788
837efl_have_eet="no" 789efl_have_eet="no"
@@ -1110,6 +1062,8 @@ AC_MSG_RESULT([${have_signature}])
1110 1062
1111EFL_CHECK_LIBS([EET], [libjpeg zlib]) 1063EFL_CHECK_LIBS([EET], [libjpeg zlib])
1112 1064
1065# Eina library
1066
1113requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}" 1067requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}"
1114 1068
1115PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}]) 1069PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
@@ -1187,6 +1141,67 @@ fi
1187 1141
1188#### End of Eet 1142#### End of Eet
1189 1143
1144
1145#### Eo
1146
1147efl_have_eo="no"
1148
1149if test "x${efl_want_build_eo}" = "xyes" ; then
1150
1151AC_MSG_NOTICE([Eo checks])
1152
1153### Default values
1154
1155### Additional options to configure
1156
1157### Checks for programs
1158
1159### Checks for libraries
1160
1161# Eina library
1162
1163requirements_pc_eo="eina >= 1.7.99"
1164
1165PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
1166
1167# Example (evas one)
1168
1169PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
1170AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
1171
1172### Checks for header files
1173
1174### Checks for types
1175
1176### Checks for structures
1177
1178### Checks for compiler characteristics
1179
1180EFL_EO_BUILD=""
1181case "$host_os" in
1182 mingw*)
1183 EFL_EO_BUILD="-DEFL_EO_BUILD"
1184 ;;
1185esac
1186AC_SUBST([EFL_EO_BUILD])
1187
1188### Checks for linker characteristics
1189
1190### Checks for library functions
1191
1192### Check availability
1193
1194efl_have_eo="yes"
1195
1196else
1197
1198AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [false])
1199
1200fi
1201
1202#### End of Eo
1203
1204
1190#### Evas 1205#### Evas
1191 1206
1192#AC_MSG_NOTICE([Evas checks]) 1207#AC_MSG_NOTICE([Evas checks])
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am
index 9ebb2ddd6b..15fa26cece 100644
--- a/src/benchmarks/Makefile.am
+++ b/src/benchmarks/Makefile.am
@@ -6,7 +6,9 @@ SUBDIRS = eina eo
6 6
7benchmark: 7benchmark:
8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark 8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
9if EFL_BUILD_EO
9 @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark 10 @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark
11endif
10 12
11benchmark-e17: 13benchmark-e17:
12 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17 14 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 94bea4e12a..0a874138fb 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -4,14 +4,18 @@ SUBDIRS = eina eet eo
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
7 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
8if EFL_BUILD_EET 7if EFL_BUILD_EET
9 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples 8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
10endif 9endif
10if EFL_BUILD_EO
11 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
12endif
11 13
12install-examples: 14install-examples:
13 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 15 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
14 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
15if EFL_BUILD_EET 16if EFL_BUILD_EET
16 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples 17 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
17endif 18endif
19if EFL_BUILD_EO
20 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
21endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 18623daf73..e715faa107 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,11 +1,23 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina eo 3SUBDIRS =
4 4
5if HAVE_WINDOWS 5if HAVE_WINDOWS
6
6SUBDIRS += evil 7SUBDIRS += evil
8
7endif 9endif
8 10
11SUBDIRS += eina
12
9if EFL_BUILD_EET 13if EFL_BUILD_EET
14
10SUBDIRS += eet 15SUBDIRS += eet
16
17endif
18
19if EFL_BUILD_EO
20
21SUBDIRS += eo
22
11endif 23endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index e193b85ac8..4598ce34a7 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,7 +1,15 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina eo 3SUBDIRS = eina
4 4
5if EFL_BUILD_EET 5if EFL_BUILD_EET
6
6SUBDIRS += eet 7SUBDIRS += eet
8
9endif
10
11if EFL_BUILD_EO
12
13SUBDIRS += eo
14
7endif 15endif