vlc | branch: master | Rafaël Carré <[email protected]> | Sat Sep 21 20:16:34 2013 +0200| [0b896ac15a08ff4ffd0278f1d5f38c690c6ad6ce] | committer: Rafaël Carré
Fix linking of motion and rotate modules 142e288b178716 set LDFLAGS conditionally Be sure that it is always set and concatenate the DARWIN flags > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0b896ac15a08ff4ffd0278f1d5f38c690c6ad6ce --- modules/control/Modules.am | 3 ++- modules/video_filter/Modules.am | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/control/Modules.am b/modules/control/Modules.am index 13cf7ac..a3119c3 100644 --- a/modules/control/Modules.am +++ b/modules/control/Modules.am @@ -16,8 +16,9 @@ noinst_LTLIBRARIES = libvlc_motion.la libmotion_plugin_la_SOURCES = motion.c libmotion_plugin_la_LIBADD = libvlc_motion.la +libmotion_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(controldir)' if HAVE_DARWIN -libmotion_plugin_la_LDFLAGS = -Wl,-framework,IOKit,-framework,CoreFoundation +libmotion_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation endif control_LTLIBRARIES += \ diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index a913e5b..9caf978 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -68,8 +68,9 @@ SOURCES_opencv_example = opencv_example.cpp filter_event_info.h librotate_plugin_la_SOURCES = rotate.c librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM) +librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)' if HAVE_DARWIN -librotate_plugin_la_LDFLAGS = -Wl,-framework,IOKit,-framework,CoreFoundation +librotate_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation endif video_filter_LTLIBRARIES += librotate_plugin.la _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
