summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-19 19:42:57 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2018-07-30 17:40:57 +0200
commitbc0d74c28172de9b19e1622a886ef58e9625dba5 (patch)
tree9464ad8569100674713ff99e4b8e265440c9190c /src
parentc87dd2214c17aaba6fe420816c1c13c9a76dc570 (diff)
build: fix rpath for binaries which use ecore-x dependencies
somehow ecore-x explicitly pulls in ${libdir}/libX11.so at link-time, which causes libtool to add ${libdir} to the rpath executable wrappers before the remainder of the in-tree efl paths. this causes binaries run from these wrappers (e.g., tests, built-time tools such as codegens) to use system libraries instead of in-tree libraries @fix Differential Revision: https://phab.enlightenment.org/D6635
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Ecore.am44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index a33c8f8..30e4998 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -295,36 +295,36 @@ tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
295@ECORE_CFLAGS@ \ 295@ECORE_CFLAGS@ \
296@ECORE_AUDIO_CFLAGS@ \ 296@ECORE_AUDIO_CFLAGS@ \
297@ECORE_FILE_CFLAGS@ \ 297@ECORE_FILE_CFLAGS@ \
298@ECORE_X_CFLAGS@ \
299@ECORE_IMF_CFLAGS@ \ 298@ECORE_IMF_CFLAGS@ \
300@ECORE_EVAS_CFLAGS@ \ 299@ECORE_EVAS_CFLAGS@ \
301@ECORE_WAYLAND_CFLAGS@ \
302@ECORE_WAYLAND_SRV_CFLAGS@ \
303@ECORE_FB_CFLAGS@ \ 300@ECORE_FB_CFLAGS@ \
304@ECORE_INPUT_CFLAGS@ 301@ECORE_INPUT_CFLAGS@ \
302@ECORE_X_CFLAGS@ \
303@ECORE_WAYLAND_CFLAGS@ \
304@ECORE_WAYLAND_SRV_CFLAGS@
305 305
306tests_ecore_ecore_suite_LDADD = \ 306tests_ecore_ecore_suite_LDADD = \
307@CHECK_LIBS@ \ 307@CHECK_LIBS@ \
308@USE_ECORE_LIBS@ \ 308@USE_ECORE_LIBS@ \
309@USE_ECORE_AUDIO_LIBS@ \ 309@USE_ECORE_AUDIO_LIBS@ \
310@USE_ECORE_FILE_LIBS@ \ 310@USE_ECORE_FILE_LIBS@ \
311@USE_ECORE_X_LIBS@ \
312@USE_ECORE_IMF_LIBS@ \ 311@USE_ECORE_IMF_LIBS@ \
313@USE_ECORE_EVAS_LIBS@ \ 312@USE_ECORE_EVAS_LIBS@ \
314@USE_ECORE_WAYLAND_LIBS@ \
315@USE_ECORE_FB_LIBS@ \ 313@USE_ECORE_FB_LIBS@ \
316@ECORE_WAYLAND_SRV_LIBS@ \ 314@USE_ECORE_INPUT_LIBS@ \
317@USE_ECORE_INPUT_LIBS@ 315@USE_ECORE_X_LIBS@ \
316@USE_ECORE_WAYLAND_LIBS@ \
317@ECORE_WAYLAND_SRV_LIBS@
318tests_ecore_ecore_suite_DEPENDENCIES = \ 318tests_ecore_ecore_suite_DEPENDENCIES = \
319@USE_ECORE_INTERNAL_LIBS@ \ 319@USE_ECORE_INTERNAL_LIBS@ \
320@USE_ECORE_AUDIO_INTERNAL_LIBS@ \ 320@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
321@USE_ECORE_FILE_INTERNAL_LIBS@ \ 321@USE_ECORE_FILE_INTERNAL_LIBS@ \
322@USE_ECORE_X_INTERNAL_LIBS@ \
323@USE_ECORE_IMF_INTERNAL_LIBS@ \ 322@USE_ECORE_IMF_INTERNAL_LIBS@ \
324@USE_ECORE_EVAS_INTERNAL_LIBS@ \ 323@USE_ECORE_EVAS_INTERNAL_LIBS@ \
325@USE_ECORE_WAYLAND_INTERNAL_LIBS@ \
326@USE_ECORE_FB_INTERNAL_LIBS@ \ 324@USE_ECORE_FB_INTERNAL_LIBS@ \
327@USE_ECORE_INPUT_INTERNAL_LIBS@ 325@USE_ECORE_INPUT_INTERNAL_LIBS@ \
326@USE_ECORE_X_INTERNAL_LIBS@ \
327@USE_ECORE_WAYLAND_INTERNAL_LIBS@
328 328
329tests_ecore_efl_app_suite_SOURCES = \ 329tests_ecore_efl_app_suite_SOURCES = \
330tests/ecore/efl_app_test_loop.c \ 330tests/ecore/efl_app_test_loop.c \
@@ -341,36 +341,36 @@ tests_ecore_efl_app_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
341@ECORE_CFLAGS@ \ 341@ECORE_CFLAGS@ \
342@ECORE_AUDIO_CFLAGS@ \ 342@ECORE_AUDIO_CFLAGS@ \
343@ECORE_FILE_CFLAGS@ \ 343@ECORE_FILE_CFLAGS@ \
344@ECORE_X_CFLAGS@ \
345@ECORE_IMF_CFLAGS@ \ 344@ECORE_IMF_CFLAGS@ \
346@ECORE_EVAS_CFLAGS@ \ 345@ECORE_EVAS_CFLAGS@ \
347@ECORE_WAYLAND_CFLAGS@ \
348@ECORE_WAYLAND_SRV_CFLAGS@ \
349@ECORE_FB_CFLAGS@ \ 346@ECORE_FB_CFLAGS@ \
350@ECORE_INPUT_CFLAGS@ 347@ECORE_INPUT_CFLAGS@ \
348@ECORE_X_CFLAGS@ \
349@ECORE_WAYLAND_CFLAGS@ \
350@ECORE_WAYLAND_SRV_CFLAGS@
351 351
352tests_ecore_efl_app_suite_LDADD = \ 352tests_ecore_efl_app_suite_LDADD = \
353@CHECK_LIBS@ \ 353@CHECK_LIBS@ \
354@USE_ECORE_LIBS@ \ 354@USE_ECORE_LIBS@ \
355@USE_ECORE_AUDIO_LIBS@ \ 355@USE_ECORE_AUDIO_LIBS@ \
356@USE_ECORE_FILE_LIBS@ \ 356@USE_ECORE_FILE_LIBS@ \
357@USE_ECORE_X_LIBS@ \
358@USE_ECORE_IMF_LIBS@ \ 357@USE_ECORE_IMF_LIBS@ \
359@USE_ECORE_EVAS_LIBS@ \ 358@USE_ECORE_EVAS_LIBS@ \
360@USE_ECORE_WAYLAND_LIBS@ \
361@USE_ECORE_FB_LIBS@ \ 359@USE_ECORE_FB_LIBS@ \
362@ECORE_WAYLAND_SRV_LIBS@ \ 360@USE_ECORE_INPUT_LIBS@ \
363@USE_ECORE_INPUT_LIBS@ 361@USE_ECORE_X_LIBS@ \
362@USE_ECORE_WAYLAND_LIBS@ \
363@ECORE_WAYLAND_SRV_LIBS@
364tests_ecore_efl_app_suite_DEPENDENCIES = \ 364tests_ecore_efl_app_suite_DEPENDENCIES = \
365@USE_ECORE_INTERNAL_LIBS@ \ 365@USE_ECORE_INTERNAL_LIBS@ \
366@USE_ECORE_AUDIO_INTERNAL_LIBS@ \ 366@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
367@USE_ECORE_FILE_INTERNAL_LIBS@ \ 367@USE_ECORE_FILE_INTERNAL_LIBS@ \
368@USE_ECORE_X_INTERNAL_LIBS@ \
369@USE_ECORE_IMF_INTERNAL_LIBS@ \ 368@USE_ECORE_IMF_INTERNAL_LIBS@ \
370@USE_ECORE_EVAS_INTERNAL_LIBS@ \ 369@USE_ECORE_EVAS_INTERNAL_LIBS@ \
371@USE_ECORE_WAYLAND_INTERNAL_LIBS@ \
372@USE_ECORE_FB_INTERNAL_LIBS@ \ 370@USE_ECORE_FB_INTERNAL_LIBS@ \
373@USE_ECORE_INPUT_INTERNAL_LIBS@ 371@USE_ECORE_INPUT_INTERNAL_LIBS@ \
372@USE_ECORE_X_INTERNAL_LIBS@ \
373@USE_ECORE_WAYLAND_INTERNAL_LIBS@
374 374
375if HAVE_ECORE_X 375if HAVE_ECORE_X
376tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_x.c 376tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_x.c