summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:22:24 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:22:24 +0200
commit1be99f87c7db2f60dcdc2f9b50451a5ef6373f2c (patch)
treec0902196e9d22762a20cd01406de538715863ce0
parent36ba2fc01d654287875f3e491f1545b77cf6e4b8 (diff)
ector: reorder compilation to first do Ector then Evas.
-rw-r--r--configure.ac82
-rw-r--r--src/Makefile.am2
2 files changed, 42 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac
index e773931..f5f8d44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1215,6 +1215,47 @@ EFL_INTERNAL_DEPEND_PKG([EFL], [eo])
1215EFL_LIB_END([Efl]) 1215EFL_LIB_END([Efl])
1216#### End of Efl 1216#### End of Efl
1217 1217
1218#### Ector
1219
1220EFL_LIB_START([Ector])
1221
1222
1223### Default values
1224
1225### Additional options to configure
1226
1227### Checks for programs
1228
1229### Checks for libraries
1230
1231## Compatibility layers
1232
1233EFL_PLATFORM_DEPEND([ECTOR], [evil])
1234
1235EFL_INTERNAL_DEPEND_PKG([ECTOR], [eina])
1236EFL_INTERNAL_DEPEND_PKG([ECTOR], [eo])
1237EFL_INTERNAL_DEPEND_PKG([ECTOR], [efl])
1238
1239EFL_EVAL_PKGS([ECTOR])
1240
1241### Checks for header files
1242
1243### Checks for types
1244
1245### Checks for structures
1246
1247### Checks for compiler characteristics
1248
1249### Checks for linker characteristics
1250
1251### Checks for library functions
1252
1253### Check availability
1254
1255EFL_LIB_END([ECTOR])
1256
1257#### End of Ector
1258
1218#### Evas 1259#### Evas
1219 1260
1220EFL_LIB_START([Evas]) 1261EFL_LIB_START([Evas])
@@ -2095,47 +2136,6 @@ EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}])
2095EFL_LIB_END([Evas]) 2136EFL_LIB_END([Evas])
2096#### End of Evas 2137#### End of Evas
2097 2138
2098#### Ector
2099
2100EFL_LIB_START([Ector])
2101
2102
2103### Default values
2104
2105### Additional options to configure
2106
2107### Checks for programs
2108
2109### Checks for libraries
2110
2111## Compatibility layers
2112
2113EFL_PLATFORM_DEPEND([ECTOR], [evil])
2114
2115EFL_INTERNAL_DEPEND_PKG([ECTOR], [eina])
2116EFL_INTERNAL_DEPEND_PKG([ECTOR], [eo])
2117EFL_INTERNAL_DEPEND_PKG([ECTOR], [efl])
2118
2119EFL_EVAL_PKGS([ECTOR])
2120
2121### Checks for header files
2122
2123### Checks for types
2124
2125### Checks for structures
2126
2127### Checks for compiler characteristics
2128
2129### Checks for linker characteristics
2130
2131### Checks for library functions
2132
2133### Check availability
2134
2135EFL_LIB_END([ECTOR])
2136
2137#### End of Ector
2138
2139#### Edje CXX 2139#### Edje CXX
2140EFL_LIB_START([Evas_Cxx]) 2140EFL_LIB_START([Evas_Cxx])
2141 2141
diff --git a/src/Makefile.am b/src/Makefile.am
index df0026c..77403a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,7 @@ include Makefile_Efl.am
35include Makefile_Emile.am 35include Makefile_Emile.am
36include Makefile_Eet.am 36include Makefile_Eet.am
37include Makefile_Eolian.am 37include Makefile_Eolian.am
38include Makefile_Ector.am
38include Makefile_Evas.am 39include Makefile_Evas.am
39include Makefile_Ecore.am 40include Makefile_Ecore.am
40include Makefile_Ecore_Con.am 41include Makefile_Ecore_Con.am
@@ -56,7 +57,6 @@ include Makefile_Ecore_Evas.am
56include Makefile_Ecore_Audio.am 57include Makefile_Ecore_Audio.am
57include Makefile_Ecore_Audio_Cxx.am 58include Makefile_Ecore_Audio_Cxx.am
58include Makefile_Ecore_Avahi.am 59include Makefile_Ecore_Avahi.am
59include Makefile_Ector.am
60include Makefile_Embryo.am 60include Makefile_Embryo.am
61include Makefile_Eio.am 61include Makefile_Eio.am
62include Makefile_Eldbus.am 62include Makefile_Eldbus.am