Commit bca1bc25 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

motionlib: build only once (refs #9367)

parent f2db3173
......@@ -156,7 +156,6 @@ case "${host_os}" in
VLC_ADD_LIBS([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress])
VLC_ADD_CFLAGS([motion rotate],[-fconstant-cfstrings])
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,SystemConfiguration])
dnl Allow binaries created on Lion to run on earlier releases
......@@ -653,7 +652,7 @@ AC_CHECK_FUNC(getopt_long,, [
AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene lua chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom noise grain scene lua chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
LIBM="-lm"
], [
LIBM=""
......
......@@ -5,17 +5,17 @@ SOURCES_ntservice = ntservice.c
SOURCES_hotkeys = hotkeys.c
SOURCES_lirc = lirc.c
SOURCES_oldrc = rc.c
libvlc_motion_la_SOURCES = motionlib.c motionlib.h
if HAVE_DARWIN
motion_extra = unimotion.c unimotion.h
else
motion_extra = $(NULL)
libvlc_motion_la_SOURCES += unimotion.c unimotion.h
libvlc_motion_la_CFLAGS = $(AM_CFLAGS) -fconstant-cfstrings
endif
SOURCES_motion = \
motion.c \
motionlib.c \
motionlib.h \
$(motion_extra) \
$(NULL)
libvlc_motion_la_LDFLAGS = -static
noinst_LTLIBRARIES = libvlc_motion.la
libmotion_plugin_la_SOURCES = motion.c
libmotion_plugin_la_LIBADD = libvlc_motion.la
control_LTLIBRARIES += \
libdummy_plugin.la \
......
......@@ -72,17 +72,9 @@ SOURCES_ball = ball.c
SOURCES_opencv_wrapper = opencv_wrapper.c
SOURCES_opencv_example = opencv_example.cpp filter_event_info.h
if HAVE_DARWIN
motion_extra = ../control/unimotion.c ../control/unimotion.h
else
motion_extra = $(NULL)
endif
SOURCES_rotate = \
rotate.c \
../control/motionlib.c \
../control/motionlib.h \
$(motion_extra) \
$(NULL)
librotate_plugin_la_SOURCES = rotate.c
librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM)
video_filter_LTLIBRARIES += librotate_plugin.la
SOURCES_colorthres = colorthres.c
SOURCES_extract = extract.c
......@@ -157,7 +149,6 @@ video_filter_LTLIBRARIES += \
libposterize_plugin.la \
libpsychedelic_plugin.la \
libripple_plugin.la \
librotate_plugin.la \
librss_plugin.la \
libscale_plugin.la \
libscene_plugin.la \
......
Supports Markdown
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