Commit 329373a8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

video_output: finish conversion to Automake syntax

parent 2cab85e8
......@@ -3220,11 +3220,6 @@ then
if test "${SYS}" != "darwin"; then
VLC_ADD_PLUGIN([vout_sdl])
fi
if test "${SYS}" != "mingw32" -a "${SYS}" != "os2"; then
VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11])
fi
VLC_ADD_CFLAGS([vout_sdl],[${SDL_CFLAGS}])
VLC_ADD_LIBS([vout_sdl],[${SDL_LIBS}])
# SDL_image
AS_IF([ test "${enable_sdl_image}" != "no"],[
......@@ -3336,12 +3331,8 @@ dnl
AC_ARG_ENABLE(android-surface,
[ --enable-android-surface Android Surface video output module (default disabled)])
if test "${enable_android_surface}" = "yes"; then
if test "${HAVE_ANDROID}" = "1"; then
VLC_ADD_PLUGIN([android_surface])
VLC_ADD_LIBS([android_surface], [-ldl])
VLC_ADD_PLUGIN([android_opaque])
VLC_ADD_LIBS([android_opaque], [-ldl])
fi
fi
dnl
......@@ -3469,10 +3460,6 @@ then
if test "${have_aa}" = "true"
then
VLC_ADD_PLUGIN([aa])
VLC_ADD_LIBS([aa],[-laa])
if test "${SYS}" != "mingw32"; then
VLC_ADD_LIBS([aa],[${X_LIBS} ${X_PRE_LIBS} -lX11])
fi
fi
fi
......
voutdir = $(pluginsdir)/video_output
noinst_LTLIBRARIES =
vout_LTLIBRARIES =
SOURCES_aa = aa.c
SOURCES_fb = fb.c
SOURCES_vout_sdl = sdl.c
SOURCES_directfb = directfb.c
SOURCES_vmem = vmem.c
SOURCES_yuv = yuv.c
SOURCES_android_surface = android/surface.c android/utils.c android/utils.h
SOURCES_android_opaque = android/opaque.c android/utils.c android/utils.h
if HAVE_DECKLINK
libdecklinkoutput_plugin_la_SOURCES = decklink.cpp
libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklinkoutput)
......@@ -221,6 +211,7 @@ if HAVE_KVA
vout_LTLIBRARIES += libkva_plugin.la
endif
### Android ###
libegl_android_plugin_la_SOURCES = egl.c
......@@ -229,15 +220,71 @@ libegl_android_plugin_la_LIBADD = $(EGL_LIBS)
libandroid_native_window_plugin_la_SOURCES = android/nativewindow.c android/utils.c
libandroid_native_window_plugin_la_CFLAGS = $(AM_CFLAGS)
libandroid_native_window_plugin_la_LIBADD = -ldl
libandroid_native_window_plugin_la_LIBADD = $(LIBDL)
libandroid_opaque_plugin_la_SOURCES = android/opaque.c android/utils.c android/utils.h
libandroid_opaque_plugin_la_CFLAGS = $(AM_CFLAGS)
libandroid_opaque_plugin_la_LIBADD = $(LIBDL)
libandroid_opaque_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libandroid_opaque_plugin.la
libandroid_surface_plugin_la_SOURCES = android/surface.c android/utils.c android/utils.h
libandroid_surface_plugin_la_CFLAGS = $(AM_CFLAGS)
libandroid_surface_plugin_la_LIBADD = $(LIBDL)
libandroid_surface_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libandroid_surface_plugin.la
if HAVE_ANDROID
vout_LTLIBRARIES += libandroid_native_window_plugin.la
vout_LTLIBRARIES += $(LTLIBandroid_opaque)
vout_LTLIBRARIES += $(LTLIBandroid_surface)
if HAVE_EGL
vout_LTLIBRARIES += libegl_android_plugin.la
endif
endif
### FrameBuffer ###
libdirectfb_plugin_la_SOURCES = directfb.c
libdirectfb_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_directfb)
libdirectfb_plugin_la_LIBADD = $(LIBS_directfb)
libdirectfb_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libdirectfb_plugin.la
vout_LTLIBRARIES += $(LTLIBdirectfb)
libfb_plugin_la_SOURCES = fb.c
libfb_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libfb_plugin.la
vout_LTLIBRARIES += $(LTLIBfb)
### Simple DirectMedia Layer ###
libvout_sdl_plugin_la_SOURCES = sdl.c
libvout_sdl_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDL_CFLAGS)
libvout_sdl_plugin_la_LIBADD = $(SDL_LIBS)
if !HAVE_WIN32
if !HAVE_OS2
libvout_sdl_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
endif
endif
libvout_sdl_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libvout_sdl_plugin.la
vout_LTLIBRARIES += $(LTLIBvout_sdl)
### ASCII Art ###
libaa_plugin_la_SOURCES = aa.c
libaa_plugin_la_LIBADD = -laa
if !HAVE_WIN32
libaa_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
endif
libaa_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libaa_plugin.la
vout_LTLIBRARIES += $(LTLIBaa)
### Coloured ASCII art ###
libcaca_plugin_la_SOURCES = caca.c
libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
......@@ -251,8 +298,11 @@ libcaca_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libcaca_plugin.la
vout_LTLIBRARIES += $(LTLIBcaca)
### Common ###
libvdummy_plugin_la_SOURCES = vdummy.c
libvmem_plugin_la_SOURCES = vmem.c
libyuv_plugin_la_SOURCES = yuv.c
vout_LTLIBRARIES += \
libvdummy_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