[vlc-commits] x11: split out Makefile

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 13 10:35:15 2019 +0300| [83aa7352acbdb547f14489a797b194bb69fb0cf0] | committer: Rémi Denis-Courmont

x11: split out Makefile

Copy-paste, no functional changes.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83aa7352acbdb547f14489a797b194bb69fb0cf0
---

 modules/video_output/Makefile.am     | 70 +---------------------------------
 modules/video_output/xcb/Makefile.am | 73 ++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 68 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 47fbe149f3..23a2bee5cb 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -127,12 +127,6 @@ libvk_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/display.c
 libvk_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_COMMONCFLAGS)
 libvk_plugin_la_LIBADD = $(VULKAN_COMMONLIBS)
 
-libvk_x11_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/surface.c \
-			      video_output/vulkan/platform_xcb.c
-libvk_x11_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(VULKAN_COMMONCFLAGS) \
-			     -DVK_USE_PLATFORM_XCB_KHR -DPLATFORM_NAME=X11
-libvk_x11_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) $(XCB_LIBS)
-
 libvk_win32_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) video_output/vulkan/surface.c \
 				video_output/vulkan/platform_win32.c
 libvk_win32_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_COMMONCFLAGS) \
@@ -147,9 +141,6 @@ libvk_android_plugin_la_LIBADD = $(VULKAN_COMMONLIBS)
 
 if HAVE_VULKAN
 vout_LTLIBRARIES += libvk_plugin.la
-if HAVE_XCB
-vout_LTLIBRARIES += libvk_x11_plugin.la
-endif
 if HAVE_WIN32_DESKTOP
 vout_LTLIBRARIES += libvk_win32_plugin.la
 endif
@@ -158,65 +149,8 @@ vout_LTLIBRARIES += libvk_android_plugin.la
 endif
 endif
 
-### XCB ###
-libvlc_xcb_events_la_SOURCES = \
-	video_output/xcb/events.c video_output/xcb/events.h
-libvlc_xcb_events_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
-libvlc_xcb_events_la_LDFLAGS = \
-	-no-undefined \
-	-export-symbols-regex ^vlc_xcb_ \
-	-version-info 0:0:0
-libvlc_xcb_events_la_LIBADD = $(XCB_LIBS) $(LTLIBVLCCORE)
-
-libxcb_x11_plugin_la_SOURCES = \
-	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_render_plugin_la_SOURCES = \
-	video_output/xcb/pictures.c video_output/xcb/pictures.h \
-	video_output/xcb/render.c
-libxcb_render_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_RENDER_CFLAGS)
-libxcb_render_plugin_la_LIBADD = libvlc_xcb_events.la \
-	$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_RENDER_LIBS) $(LIBM)
-
-libxcb_window_plugin_la_SOURCES = video_output/xcb/window.c
-libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(CFLAGS_xcb_window) \
-	$(XPROTO_CFLAGS) $(XCB_CFLAGS) \
-	$(XCB_XKB_CFLAGS) $(XKBCOMMON_X11_CFLAGS)
-libxcb_window_plugin_la_LIBADD = $(XPROTO_LIBS) $(XCB_LIBS) \
-	$(XCB_XKB_LIBS) $(XKBCOMMON_X11_LIBS)
-
-libegl_x11_plugin_la_SOURCES = video_output/opengl/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 = video_output/glx.c
-libglx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libglx_plugin_la_LIBADD = $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
-
-if HAVE_XCB
-pkglib_LTLIBRARIES += libvlc_xcb_events.la
-vout_LTLIBRARIES += libxcb_x11_plugin.la libxcb_render_plugin.la libxcb_window_plugin.la
-if HAVE_XKBCOMMON_X11
-libxcb_window_plugin_la_SOURCES += \
-	video_output/xcb/keysym.h video_output/xcb/xcb_keysym.h \
-	video_output/xcb/vlc_xkb.h video_output/xcb/xkb.c
-libxcb_window_plugin_la_CFLAGS += -DHAVE_XKBCOMMON
-endif
-if HAVE_EGL
-vout_LTLIBRARIES += libegl_x11_plugin.la
-endif
-if HAVE_GL
-vout_LTLIBRARIES += libglx_plugin.la
-endif
-endif
+### X11 ###
+include video_output/xcb/Makefile.am
 
 
 ### Wayland ###
diff --git a/modules/video_output/xcb/Makefile.am b/modules/video_output/xcb/Makefile.am
new file mode 100644
index 0000000000..f946e07ce7
--- /dev/null
+++ b/modules/video_output/xcb/Makefile.am
@@ -0,0 +1,73 @@
+### XCB ###
+libvlc_xcb_events_la_SOURCES = \
+	video_output/xcb/events.c video_output/xcb/events.h
+libvlc_xcb_events_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
+libvlc_xcb_events_la_LDFLAGS = \
+	-no-undefined \
+	-export-symbols-regex ^vlc_xcb_ \
+	-version-info 0:0:0
+libvlc_xcb_events_la_LIBADD = $(XCB_LIBS) $(LTLIBVLCCORE)
+
+libxcb_x11_plugin_la_SOURCES = \
+	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_render_plugin_la_SOURCES = \
+	video_output/xcb/pictures.c video_output/xcb/pictures.h \
+	video_output/xcb/render.c
+libxcb_render_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_RENDER_CFLAGS)
+libxcb_render_plugin_la_LIBADD = libvlc_xcb_events.la \
+	$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_RENDER_LIBS) $(LIBM)
+
+libxcb_window_plugin_la_SOURCES = video_output/xcb/window.c
+libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	$(CFLAGS_xcb_window) \
+	$(XPROTO_CFLAGS) $(XCB_CFLAGS) \
+	$(XCB_XKB_CFLAGS) $(XKBCOMMON_X11_CFLAGS)
+libxcb_window_plugin_la_LIBADD = $(XPROTO_LIBS) $(XCB_LIBS) \
+	$(XCB_XKB_LIBS) $(XKBCOMMON_X11_LIBS)
+
+libvk_x11_plugin_la_SOURCES = $(VULKAN_COMMONSOURCES) \
+	video_output/vulkan/surface.c \
+	video_output/vulkan/platform_xcb.c
+libvk_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	$(XCB_CFLAGS) $(VULKAN_COMMONCFLAGS) \
+	-DVK_USE_PLATFORM_XCB_KHR -DPLATFORM_NAME=X11
+libvk_x11_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) $(XCB_LIBS)
+
+libegl_x11_plugin_la_SOURCES = video_output/opengl/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 = video_output/glx.c
+libglx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
+libglx_plugin_la_LIBADD = $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
+
+if HAVE_XCB
+pkglib_LTLIBRARIES += libvlc_xcb_events.la
+vout_LTLIBRARIES += \
+	libxcb_x11_plugin.la \
+	libxcb_render_plugin.la \
+	libxcb_window_plugin.la
+if HAVE_XKBCOMMON_X11
+libxcb_window_plugin_la_SOURCES += \
+	video_output/xcb/keysym.h video_output/xcb/xcb_keysym.h \
+	video_output/xcb/vlc_xkb.h video_output/xcb/xkb.c
+libxcb_window_plugin_la_CFLAGS += -DHAVE_XKBCOMMON
+endif
+if HAVE_VULKAN
+vout_LTLIBRARIES += libvk_x11_plugin.la
+endif
+if HAVE_EGL
+vout_LTLIBRARIES += libegl_x11_plugin.la
+endif
+if HAVE_GL
+vout_LTLIBRARIES += libglx_plugin.la
+endif
+endif