Commit 0b896ac1 authored by Rafaël Carré's avatar Rafaël Carré

Fix linking of motion and rotate modules

142e288b set LDFLAGS conditionally
Be sure that it is always set and concatenate the DARWIN flags
parent 8eabb7be
...@@ -16,8 +16,9 @@ noinst_LTLIBRARIES = libvlc_motion.la ...@@ -16,8 +16,9 @@ noinst_LTLIBRARIES = libvlc_motion.la
libmotion_plugin_la_SOURCES = motion.c libmotion_plugin_la_SOURCES = motion.c
libmotion_plugin_la_LIBADD = libvlc_motion.la libmotion_plugin_la_LIBADD = libvlc_motion.la
libmotion_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(controldir)'
if HAVE_DARWIN if HAVE_DARWIN
libmotion_plugin_la_LDFLAGS = -Wl,-framework,IOKit,-framework,CoreFoundation libmotion_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
endif endif
control_LTLIBRARIES += \ control_LTLIBRARIES += \
......
...@@ -68,8 +68,9 @@ SOURCES_opencv_example = opencv_example.cpp filter_event_info.h ...@@ -68,8 +68,9 @@ SOURCES_opencv_example = opencv_example.cpp filter_event_info.h
librotate_plugin_la_SOURCES = rotate.c librotate_plugin_la_SOURCES = rotate.c
librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM) librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM)
librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
if HAVE_DARWIN if HAVE_DARWIN
librotate_plugin_la_LDFLAGS = -Wl,-framework,IOKit,-framework,CoreFoundation librotate_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
endif endif
video_filter_LTLIBRARIES += librotate_plugin.la video_filter_LTLIBRARIES += librotate_plugin.la
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment