videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

video_output: remove makefile recursion

pull/24/head
Rémi Denis-Courmont 12 years ago
parent
329373a875
commit
76f2664529
4 changed files with 65 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      configure.ac
  2. 2
      modules/Makefile.am
  3. 2
      modules/hw/vdpau/Makefile.am
  4. 113
      modules/video_output/Makefile.am

1
configure.ac
View File

@ -4263,7 +4263,6 @@ AC_CONFIG_FILES([
modules/stream_out/Makefile
modules/text_renderer/Makefile
modules/video_filter/Makefile
modules/video_output/Makefile
modules/visualization/Makefile
modules/hw/vdpau/Makefile
modules/hw/mmal/Makefile

2
modules/Makefile.am
View File

@ -11,7 +11,6 @@ BASE_SUBDIRS = \
packetizer \
text_renderer \
video_filter \
video_output \
visualization
EXTRA_SUBDIRS = \
access_output \
@ -53,6 +52,7 @@ include services_discovery/Makefile.am
include stream_filter/Makefile.am
include video_chroma/Makefile.am
include video_splitter/Makefile.am
include video_output/Makefile.am
BUILT_SOURCES += dummy.cpp

2
modules/hw/vdpau/Makefile.am
View File

@ -48,6 +48,6 @@ libvdpau_display_plugin_la_SOURCES = display.c
libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../video_output/xcb
libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
libvdpau_display_plugin_la_LIBADD = libvlc_vdpau.la \
../../video_output/libvlc_xcb_events.la \
../../libvlc_xcb_events.la \
$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
vdpau_LTLIBRARIES += libvdpau_display_plugin.la

113
modules/video_output/Makefile.am
View File

@ -1,28 +1,27 @@
voutdir = $(pluginsdir)/video_output
noinst_LTLIBRARIES =
vout_LTLIBRARIES =
if HAVE_DECKLINK
libdecklinkoutput_plugin_la_SOURCES = decklink.cpp
libdecklinkoutput_plugin_la_SOURCES = video_output/decklink.cpp
libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklinkoutput)
libdecklinkoutput_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL)
vout_LTLIBRARIES += libdecklinkoutput_plugin.la
endif
if HAVE_OSX
libvout_macosx_plugin_la_SOURCES = macosx.m opengl.c opengl.h
libvout_macosx_plugin_la_SOURCES = video_output/macosx.m video_output/opengl.c video_output/opengl.h
libvout_macosx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
libvout_macosx_plugin_la_LIBADD = $(GL_LIBS)
libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa
libcaopengllayer_plugin_la_SOURCES = caopengllayer.m opengl.c opengl.h
libcaopengllayer_plugin_la_SOURCES = video_output/caopengllayer.m video_output/opengl.c video_output/opengl.h
libcaopengllayer_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
libcaopengllayer_plugin_la_LIBADD = $(GL_LIBS)
libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore
vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la
endif
libvout_ios2_plugin_la_SOURCES = ios2.m opengl.h opengl.c
libvout_ios2_plugin_la_SOURCES = video_output/ios2.m video_output/opengl.h video_output/opengl.c
libvout_ios2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
libvout_ios2_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(GL_OBJCFLAGS)
libvout_ios2_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS)
@ -33,12 +32,14 @@ endif
### OpenGL ###
# TODO: merge all three source files (?)
libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgles2_plugin_la_SOURCES = video_output/opengl.c video_output/opengl.h
video_output/gl.c
libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES=2
libgles2_plugin_la_LIBADD = $(GLES2_LIBS)
libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libgles1_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgles1_plugin_la_SOURCES = video_output/opengl.c video_output/opengl.h \
video_output/gl.c
libgles1_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES1_CFLAGS) -DUSE_OPENGL_ES=1
libgles1_plugin_la_LIBADD = $(GLES1_LIBS)
libgles1_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
@ -46,7 +47,8 @@ libgles1_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libgles2_plugin.la libgles1_plugin.la
vout_LTLIBRARIES += $(LTLIBgles2) $(LTLIBgles1)
libgl_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgl_plugin_la_SOURCES = video_output/opengl.c video_output/opengl.h \
video_output/gl.c
libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
libgl_plugin_la_LIBADD = $(GL_LIBS)
if HAVE_GL
@ -55,48 +57,52 @@ endif
### XCB ###
libvlc_xcb_events_la_SOURCES = xcb/events.c xcb/events.h
libvlc_xcb_events_la_SOURCES = \
video_output/xcb/events.c video_output/xcb/events.h
libvlc_xcb_events_la_CPPFLAGS = -DMODULE_STRING=\"xcb\"
libvlc_xcb_events_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
libvlc_xcb_events_la_LDFLAGS = -static
libvlc_xcb_events_la_LIBADD = $(XCB_LIBS)
libxcb_x11_plugin_la_SOURCES = \
xcb/pictures.c xcb/pictures.h \
xcb/x11.c
video_output/xcb/pictures.c video_output/xcb/pictures.h \
video_output/xcb/x11.c
libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS)
libxcb_x11_plugin_la_LIBADD = libvlc_xcb_events.la \
$(XCB_LIBS) $(XCB_SHM_LIBS)
libxcb_xv_plugin_la_SOURCES = \
xcb/pictures.c xcb/pictures.h \
xcb/xvideo.c
video_output/xcb/pictures.c video_output/xcb/pictures.h \
video_output/xcb/xvideo.c
libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
libxcb_xv_plugin_la_LIBADD = libvlc_xcb_events.la \
$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
libxcb_glx_plugin_la_SOURCES = \
opengl.c opengl.h \
xcb/glx.c
video_output/opengl.c video_output/opengl.h \
video_output/xcb/glx.c
libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(GL_CFLAGS)
libxcb_glx_plugin_la_LIBADD = libvlc_xcb_events.la \
$(XCB_LIBS) $(GL_LIBS)
libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c xcb/keysym.h xcb/xcb_keysym.h
libxcb_window_plugin_la_SOURCES = \
video_output/xcb/keys.c \
video_output/xcb/keysym.h video_output/xcb/xcb_keysym.h \
video_output/xcb/window.c
libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(CFLAGS_xcb_window) \
$(XPROTO_CFLAGS) $(XCB_CFLAGS) $(XCB_KEYSYMS_CFLAGS)
libxcb_window_plugin_la_LIBADD = $(XPROTO_LIBS) $(XCB_LIBS) $(XCB_KEYSYMS_LIBS)
libegl_x11_plugin_la_SOURCES = egl.c
libegl_x11_plugin_la_SOURCES = video_output/egl.c
libegl_x11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_X11=1
libegl_x11_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
libegl_x11_plugin_la_LIBADD = $(EGL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
libglx_plugin_la_SOURCES = glx.c
libglx_plugin_la_SOURCES = video_output/glx.c
libglx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
libglx_plugin_la_LIBADD = $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
@ -119,14 +125,14 @@ endif
### Wayland ###
libwl_shm_plugin_la_SOURCES = wl/shm.c
libwl_shm_plugin_la_SOURCES = video_output/wl/shm.c
libwl_shm_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
libwl_shm_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS)
if HAVE_WAYLAND
vout_LTLIBRARIES += libwl_shm_plugin.la
endif
libwl_shell_surface_plugin_la_SOURCES = wl/shell_surface.c
libwl_shell_surface_plugin_la_SOURCES = video_output/wl/shell_surface.c
libwl_shell_surface_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
libwl_shell_surface_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS) $(LIBPTHREAD)
if HAVE_WAYLAND
@ -135,9 +141,10 @@ endif
### Win32 ###
libdirect2d_plugin_la_SOURCES = msw/direct2d.c \
msw/common.c msw/common.h msw/events.c msw/events.h \
msw/win32touch.c msw/win32touch.h
libdirect2d_plugin_la_SOURCES = video_output/msw/direct2d.c \
video_output/msw/common.c video_output/msw/common.h \
video_output/msw/events.c video_output/msw/events.h \
video_output/msw/win32touch.c video_output/msw/win32touch.h
libdirect2d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_direct2d
libdirect2d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
@ -145,9 +152,11 @@ libdirect2d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBdirect2d)
EXTRA_LTLIBRARIES += libdirect2d_plugin.la
libdirect3d_plugin_la_SOURCES = msw/direct3d.c \
msw/common.c msw/common.h msw/events.c msw/events.h msw/builtin_shaders.h \
msw/win32touch.c msw/win32touch.h
libdirect3d_plugin_la_SOURCES = video_output/msw/direct3d.c \
video_output/msw/common.c video_output/msw/common.h \
video_output/msw/events.c video_output/msw/events.h \
video_output/msw/builtin_shaders.h \
video_output/msw/win32touch.c video_output/msw/win32touch.h
libdirect3d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_direct3d
libdirect3d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
@ -155,9 +164,10 @@ libdirect3d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBdirect3d)
EXTRA_LTLIBRARIES += libdirect3d_plugin.la
libdirectdraw_plugin_la_SOURCES = msw/directx.c \
msw/common.c msw/common.h msw/events.c msw/events.h \
msw/win32touch.c msw/win32touch.h
libdirectdraw_plugin_la_SOURCES = video_output/msw/directx.c \
video_output/msw/common.c video_output/msw/common.h \
video_output/msw/events.c video_output/msw/events.h \
video_output/msw/win32touch.c video_output/msw/win32touch.h
libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_directdraw
libdirectdraw_plugin_la_LIBADD = -luser32 -lgdi32 -lole32 -luuid
@ -165,9 +175,11 @@ if HAVE_DIRECTX
vout_LTLIBRARIES += libdirectdraw_plugin.la
endif
libglwin32_plugin_la_SOURCES = msw/glwin32.c opengl.c opengl.h \
msw/common.c msw/common.h msw/events.c msw/events.h \
msw/win32touch.c msw/win32touch.h
libglwin32_plugin_la_SOURCES = video_output/msw/glwin32.c \
video_output/opengl.c video_output/opengl.h \
video_output/msw/common.c video_output/msw/common.h \
video_output/msw/events.c video_output/msw/events.h \
video_output/msw/win32touch.c video_output/msw/win32touch.h
libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_glwin32
libglwin32_plugin_la_LIBADD = -lopengl32 -lgdi32 -lole32 -luuid
@ -175,9 +187,10 @@ libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBglwin32)
EXTRA_LTLIBRARIES += libglwin32_plugin.la
libwingdi_plugin_la_SOURCES = msw/wingdi.c \
msw/common.c msw/common.h msw/events.c msw/events.h \
msw/win32touch.c msw/win32touch.h
libwingdi_plugin_la_SOURCES = video_output/msw/wingdi.c \
video_output/msw/common.c video_output/msw/common.h \
video_output/msw/events.c video_output/msw/events.h \
video_output/msw/win32touch.c video_output/msw/win32touch.h
libwingdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_wingdi
libwingdi_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
@ -185,7 +198,7 @@ if HAVE_WIN32
vout_LTLIBRARIES += libwingdi_plugin.la
endif
libegl_win32_plugin_la_SOURCES = egl.c
libegl_win32_plugin_la_SOURCES = video_output/egl.c
libegl_win32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WIN32=1
libegl_win32_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
libegl_win32_plugin_la_LIBADD = $(EGL_LIBS)
@ -195,7 +208,7 @@ vout_LTLIBRARIES += libegl_win32_plugin.la
endif
endif
libdrawable_plugin_la_SOURCES = drawable.c
libdrawable_plugin_la_SOURCES = video_output/drawable.c
if HAVE_WIN32
vout_LTLIBRARIES += libdrawable_plugin.la
endif
@ -205,7 +218,7 @@ if HAVE_OS2
vout_LTLIBRARIES += libdrawable_plugin.la
endif
libkva_plugin_la_SOURCES = kva.c
libkva_plugin_la_SOURCES = video_output/kva.c
libkva_plugin_la_LIBADD = $(KVA_LIBS)
if HAVE_KVA
vout_LTLIBRARIES += libkva_plugin.la
@ -214,21 +227,21 @@ endif
### Android ###
libegl_android_plugin_la_SOURCES = egl.c
libegl_android_plugin_la_SOURCES = video_output/egl.c
libegl_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_PLATFORM_ANDROID=1
libegl_android_plugin_la_LIBADD = $(EGL_LIBS)
libandroid_native_window_plugin_la_SOURCES = android/nativewindow.c android/utils.c
libandroid_native_window_plugin_la_SOURCES = video_output/android/nativewindow.c video_output/android/utils.c
libandroid_native_window_plugin_la_CFLAGS = $(AM_CFLAGS)
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_SOURCES = video_output/android/opaque.c video_output/android/utils.c video_output/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_SOURCES = video_output/android/surface.c video_output/android/utils.c video_output/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)'
@ -246,21 +259,21 @@ endif
### FrameBuffer ###
libdirectfb_plugin_la_SOURCES = directfb.c
libdirectfb_plugin_la_SOURCES = video_output/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_SOURCES = video_output/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_SOURCES = video_output/sdl.c
libvout_sdl_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDL_CFLAGS)
libvout_sdl_plugin_la_LIBADD = $(SDL_LIBS)
if !HAVE_WIN32
@ -275,7 +288,7 @@ vout_LTLIBRARIES += $(LTLIBvout_sdl)
### ASCII Art ###
libaa_plugin_la_SOURCES = aa.c
libaa_plugin_la_SOURCES = video_output/aa.c
libaa_plugin_la_LIBADD = -laa
if !HAVE_WIN32
libaa_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
@ -286,7 +299,7 @@ vout_LTLIBRARIES += $(LTLIBaa)
### Coloured ASCII art ###
libcaca_plugin_la_SOURCES = caca.c
libcaca_plugin_la_SOURCES = video_output/caca.c
libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
libcaca_plugin_la_LIBADD = $(CACA_LIBS)
if !HAVE_WIN32
@ -300,9 +313,9 @@ vout_LTLIBRARIES += $(LTLIBcaca)
### Common ###
libvdummy_plugin_la_SOURCES = vdummy.c
libvmem_plugin_la_SOURCES = vmem.c
libyuv_plugin_la_SOURCES = yuv.c
libvdummy_plugin_la_SOURCES = video_output/vdummy.c
libvmem_plugin_la_SOURCES = video_output/vmem.c
libyuv_plugin_la_SOURCES = video_output/yuv.c
vout_LTLIBRARIES += \
libvdummy_plugin.la \

Write Preview
Loading…
Cancel
Save