aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe ANDRE <jpeg@videolan.org>2015-03-25 11:19:53 -0700
committerJean-Philippe ANDRE <jpeg@videolan.org>2015-03-25 11:56:44 -0700
commitf30c0ea3997e92d527d662cd9e33e76ed3fe0343 (patch)
treed9898dd9c1a252f5c2c78bdcc7b4fe892d66adb7
parentedje: add of textures to Edje 3D node. (diff)
downloadefl-f30c0ea3997e92d527d662cd9e33e76ed3fe0343.tar.gz
Build: Fix horribly slow compilation times
Cedric, our dear b0rker, introduced changes in the CFLAGS generation when merging Emile. While the changes seem to make sense at first sight (add the -I flags for the lib our new package depends on), they were actually a terribly bad workaround. The number of CFLAGS args would grow exponentially, slowing down libtool a lot, which is known to be slow when it has a lot of arguments.
-rw-r--r--configure.ac12
-rw-r--r--m4/efl.m42
2 files changed, 13 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 3f7b3fa584..8c27ca465c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2670,6 +2670,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas])
EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [efl])
EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eo])
EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [emile])
### Checks for header files
@@ -2948,6 +2949,7 @@ EFL_INTERNAL_DEPEND_PKG([EEZE], [eo])
EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-file])
EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-con])
EFL_INTERNAL_DEPEND_PKG([EEZE], [eet])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [emile])
EFL_DEPEND_PKG([EEZE], [UDEV], [libudev >= 148])
@@ -3154,6 +3156,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet])
EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eo])
EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [emile])
EFL_ADD_LIBS([ECORE_AUDIO], [-lm])
@@ -3710,6 +3713,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas])
EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [efl])
EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eo])
EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [emile])
### Checks for header files
@@ -3761,6 +3765,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas])
EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [efl])
EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eo])
EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [emile])
## modules
ECORE_EVAS_MODULE([extn], [${want_ecore_evas_extn}])
@@ -3910,6 +3915,7 @@ EFL_INTERNAL_DEPEND_PKG([EIO], [ecore])
EFL_INTERNAL_DEPEND_PKG([EIO], [eet])
EFL_INTERNAL_DEPEND_PKG([EIO], [eo])
EFL_INTERNAL_DEPEND_PKG([EIO], [eina])
+EFL_INTERNAL_DEPEND_PKG([EIO], [emile])
EFL_ADD_LIBS([EIO], [-lm])
@@ -3971,6 +3977,7 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file])
EFL_INTERNAL_DEPEND_PKG([EFREET], [eldbus])
EFL_INTERNAL_DEPEND_PKG([EFREET], [eo])
EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
+EFL_INTERNAL_DEPEND_PKG([EFREET], [emile])
### Checks for header files
@@ -4017,6 +4024,7 @@ EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas])
EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [efl])
EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore])
EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eo])
+EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [emile])
EFL_DEPEND_PKG([EPHYSICS], [BULLET], [bullet >= 2.80])
@@ -4080,6 +4088,7 @@ EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf])
EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eio])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [emile])
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_physics}], [ephysics])
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio])
@@ -4184,6 +4193,7 @@ EFL_INTERNAL_DEPEND_PKG([EMOTION], [eet])
EFL_INTERNAL_DEPEND_PKG([EMOTION], [evas])
EFL_INTERNAL_DEPEND_PKG([EMOTION], [efl])
EFL_INTERNAL_DEPEND_PKG([EMOTION], [eio])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [emile])
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EMOTION], [${efl_lib_optional_eeze}], [eeze])
EFL_ADD_FEATURE([EMOTION], [v4l2])
@@ -4254,6 +4264,7 @@ EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas])
EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-file])
EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-imf])
EFL_INTERNAL_DEPEND_PKG([ETHUMB], [edje])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [emile])
## modules
@@ -4299,6 +4310,7 @@ EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edje])
EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eldbus])
EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ethumb])
EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [evas])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [emile])
EFL_EVAL_PKGS([ETHUMB_CLIENT])
diff --git a/m4/efl.m4 b/m4/efl.m4
index 3d654c9268..3598ce78fe 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -152,7 +152,7 @@ case "m4_defn([DOWNOTHER])" in
;;
esac
requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
-requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNOTHER])} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
+requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
requirements_internal_libs_[]m4_defn([DOWNEFL])="lib/${libdirname}/lib${libname}.la ${requirements_internal_libs_[][]m4_defn([DOWNEFL])}"
requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_public_libs_[]m4_defn([DOWNOTHER])} ${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])}"
m4_popdef([DOWNOTHER])dnl