stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a14f97a06e7fae8b3dde4e2e588a575eb13327f4
commit a14f97a06e7fae8b3dde4e2e588a575eb13327f4
Author: Stefan Schmidt <s.schm...@samsung.com>
Date: Fri Apr 10 17:24:09 2015 +0200
build: Make sure the ecore_drm Makefile gets included after its dependencies
This problem have been observed by Scimmia22 on the Arch builds as well as
on
the jenkins wayland build job. While compiling works fine the relinking
during
make install fails with ecore-drm linking does not find eeze or eldbus as
its
deps. This only shows on systems with no efl installed, a build from
scratch.
As far as I can see we have all dependencies set correctly in configure as
well as in the Makefile which are working fine even in highly parallel
builds.
It was a bit surprising here to me that the include order is still important
with our correct dependencies. Autotools wisdom is welcome here to either
explain to me why this is needed or what the correct fix would be.
The includes all moved before Ecore_Evas because that would use ecore_drm if
enabled.
Fixes T2281
---
src/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5041799..a2e4b69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,7 +45,6 @@ include Makefile_Ecore_File.am
include Makefile_Ecore_Input.am
include Makefile_Ecore_Input_Evas.am
include Makefile_Ecore_Cocoa.am
-include Makefile_Ecore_Drm.am
include Makefile_Ecore_FB.am
include Makefile_Ecore_Psl1ght.am
include Makefile_Ecore_SDL.am
@@ -54,15 +53,16 @@ include Makefile_Ecore_Win32.am
include Makefile_Ecore_X.am
include Makefile_Ecore_IMF.am
include Makefile_Ecore_IMF_Evas.am
+include Makefile_Eldbus.am
+include Makefile_Eeze.am
+include Makefile_Ecore_Drm.am
include Makefile_Ecore_Evas.am
include Makefile_Ecore_Audio.am
include Makefile_Ecore_Audio_Cxx.am
include Makefile_Ecore_Avahi.am
include Makefile_Embryo.am
include Makefile_Eio.am
-include Makefile_Eldbus.am
include Makefile_Efreet.am
-include Makefile_Eeze.am
include Makefile_EPhysics.am
include Makefile_Edje.am
include Makefile_Emotion.am
--
