summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2015-04-10 17:24:09 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2015-04-13 11:39:00 +0200
commita14f97a06e7fae8b3dde4e2e588a575eb13327f4 (patch)
tree0d4ee5fa373cbf68d36d888cba1733009629ed84 /src/Makefile.am
parentc646b0ace5312d43f723701b6b9f331d1faf035d (diff)
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
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am6
1 files 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
45include Makefile_Ecore_Input.am 45include Makefile_Ecore_Input.am
46include Makefile_Ecore_Input_Evas.am 46include Makefile_Ecore_Input_Evas.am
47include Makefile_Ecore_Cocoa.am 47include Makefile_Ecore_Cocoa.am
48include Makefile_Ecore_Drm.am
49include Makefile_Ecore_FB.am 48include Makefile_Ecore_FB.am
50include Makefile_Ecore_Psl1ght.am 49include Makefile_Ecore_Psl1ght.am
51include Makefile_Ecore_SDL.am 50include Makefile_Ecore_SDL.am
@@ -54,15 +53,16 @@ include Makefile_Ecore_Win32.am
54include Makefile_Ecore_X.am 53include Makefile_Ecore_X.am
55include Makefile_Ecore_IMF.am 54include Makefile_Ecore_IMF.am
56include Makefile_Ecore_IMF_Evas.am 55include Makefile_Ecore_IMF_Evas.am
56include Makefile_Eldbus.am
57include Makefile_Eeze.am
58include Makefile_Ecore_Drm.am
57include Makefile_Ecore_Evas.am 59include Makefile_Ecore_Evas.am
58include Makefile_Ecore_Audio.am 60include Makefile_Ecore_Audio.am
59include Makefile_Ecore_Audio_Cxx.am 61include Makefile_Ecore_Audio_Cxx.am
60include Makefile_Ecore_Avahi.am 62include Makefile_Ecore_Avahi.am
61include Makefile_Embryo.am 63include Makefile_Embryo.am
62include Makefile_Eio.am 64include Makefile_Eio.am
63include Makefile_Eldbus.am
64include Makefile_Efreet.am 65include Makefile_Efreet.am
65include Makefile_Eeze.am
66include Makefile_EPhysics.am 66include Makefile_EPhysics.am
67include Makefile_Edje.am 67include Makefile_Edje.am
68include Makefile_Emotion.am 68include Makefile_Emotion.am