Commit 3f77b01a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

XCB: compile events.c only once (refs #9367)

parent 6310a57c
......@@ -47,13 +47,12 @@ libvdpau_chroma_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
libvdpau_chroma_plugin_la_LIBADD = $(AM_LIBADD)
libvlc_LTLIBRARIES += libvdpau_chroma_plugin.la
libvdpau_display_plugin_la_SOURCES = \
../../video_output/xcb/events.c \
display.c
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 = $(AM_LIBADD) \
$(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
libvdpau_display_plugin_la_LIBADD = \
../../video_output/libvlc_xcb_events.la \
$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
libvlc_LTLIBRARIES += libvdpau_display_plugin.la
AUTOMAKE_OPTIONS = subdir-objects
AM_LIBTOOLFLAGS=--tag=CC
noinst_LTLIBRARIES =
SOURCES_aa = aa.c
SOURCES_fb = fb.c
......@@ -51,31 +52,34 @@ libvlc_LTLIBRARIES += \
### XCB ###
libvlc_xcb_events_la_SOURCES = xcb/events.c 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 = $(AM_LIBADD) $(XCB_LIBS)
libxcb_x11_plugin_la_SOURCES = \
xcb/pictures.c xcb/pictures.h \
xcb/events.c xcb/events.h \
xcb/x11.c
libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS)
libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \
libxcb_x11_plugin_la_LIBADD = libvlc_xcb_events.la $(AM_LIBADD) \
$(XCB_LIBS) $(XCB_SHM_LIBS)
libxcb_xv_plugin_la_SOURCES = \
xcb/pictures.c xcb/pictures.h \
xcb/events.c xcb/events.h \
xcb/xvideo.c
libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \
libxcb_xv_plugin_la_LIBADD = libvlc_xcb_events.la $(AM_LIBADD) \
$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
libxcb_glx_plugin_la_SOURCES = \
opengl.c opengl.h \
xcb/events.c xcb/events.h \
xcb/glx.c
libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(GL_CFLAGS)
libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
libxcb_glx_plugin_la_LIBADD = libvlc_xcb_events.la $(AM_LIBADD) \
$(XCB_LIBS) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c xcb/keysym.h xcb/xcb_keysym.h
......@@ -90,6 +94,7 @@ libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_KEYSYMS_LIBS)
if HAVE_XCB
noinst_LTLIBRARIES += libvlc_xcb_events.la
libvlc_LTLIBRARIES += \
libxcb_x11_plugin.la \
libxcb_window_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