X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2FModules.am;h=b0a5b4b5216496a6a7130fd5230874e958ab7c2b;hb=fe2fb5d35cfb033bbd1b3f2b588de34653677c2c;hp=29a4849754683960fa8b4cd4729f979c4a68ae4a;hpb=a72df5ce248800234be9d2587317822c3644b93d;p=vlc

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 29a4849754..b0a5b4b521 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = msw qte x11
+SUBDIRS = msw
 # Automake forgets to add a proper tag to libtool with Objective-C files.
 # Moreocer Libtool should default tag to CC when none is specified but
 # obviously does not. Here is a fix for that.
@@ -7,19 +7,12 @@ LIBTOOL=@LIBTOOL@ --tag=CC
 SOURCES_aa = aa.c
 SOURCES_caca = caca.c
 SOURCES_fb = fb.c
-SOURCES_omapfb = omapfb.c
-SOURCES_ggi = ggi.c
 SOURCES_vout_sdl = sdl.c
-SOURCES_svgalib = svgalib.c
-SOURCES_mga = mga.c
-SOURCES_hd1000v = hd1000v.cpp
 SOURCES_snapshot = snapshot.c
-SOURCES_opengl = opengl.c
-SOURCES_opengllayer = opengllayer.m
 SOURCES_directfb = directfb.c
 SOURCES_vmem = vmem.c
 SOURCES_yuv = yuv.c
-SOURCES_vout_wrapper = wrapper.c
+SOURCES_vout_macosx = macosx.m
 
 libxcb_x11_plugin_la_SOURCES = \
 	xcb/xcb_vlc.h \
@@ -27,11 +20,9 @@ libxcb_x11_plugin_la_SOURCES = \
 	xcb/common.c \
 	xcb/events.c
 libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) \
-	$(XPROTO_CFLAGS)
+	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS)
 libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(XCB_LIBS) $(XCB_SHM_LIBS) \
-	$(XPROTO_LIBS)
+	$(XCB_LIBS) $(XCB_SHM_LIBS)
 libxcb_x11_plugin_la_DEPENDENCIES =
 
 libxcb_xv_plugin_la_SOURCES = \
@@ -40,18 +31,28 @@ libxcb_xv_plugin_la_SOURCES = \
 	xcb/common.c \
 	xcb/events.c
 libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS) \
-	$(XPROTO_CFLAGS)
+	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
 libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS) \
-	$(XPROTO_LIBS)
+	$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
 libxcb_xv_plugin_la_DEPENDENCIES =
 
-libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c
+libxcb_glx_plugin_la_SOURCES = \
+	xcb/xcb_vlc.h \
+	xcb/glx.c \
+	xcb/events.c
+libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	$(XLIB_XCB_CFLAGS) $(GL_CFLAGS)
+libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
+	$(XLIB_XCB_LIBS) $(GL_LIBS)
+libxcb_glx_plugin_la_DEPENDENCIES =
+
+libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c xcb/keysym.h xcb/xcb_keysym.h
 libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	$(XPROTO_CFLAGS) \
 	$(XCB_CFLAGS) \
 	$(XCB_KEYSYMS_CFLAGS)
 libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
+	$(XPROTO_LIBS) \
 	$(XCB_LIBS) \
 	$(XCB_KEYSYMS_LIBS)
 libxcb_window_plugin_la_DEPENDENCIES =
@@ -59,10 +60,12 @@ libxcb_window_plugin_la_DEPENDENCIES =
 EXTRA_LTLIBRARIES += \
 	libxcb_x11_plugin.la \
 	libxcb_xv_plugin.la \
+	libxcb_glx_plugin.la \
 	libxcb_window_plugin.la
 libvlc_LTLIBRARIES += \
 	$(LTLIBxcb_x11) \
 	$(LTLIBxcb_xv) \
+	$(LTLIBxcb_glx) \
 	$(LTLIBxcb_window)
 
 # XXX: do we need yet another modules/ subdirectory?
@@ -74,4 +77,6 @@ if HAVE_WIN32
 libvlc_LTLIBRARIES += libdrawable_plugin.la
 endif
 
-libvlc_LTLIBRARIES += libvout_wrapper_plugin.la
+libvlc_LTLIBRARIES += \
+	libvmem_plugin.la \
+	libyuv_plugin.la