[vlc-commits] XCB: compile events.c only once (refs #9367)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Sep 13 22:36:42 2013 +0300| [3f77b01af9a07951d9c3f7bedd59d5ceb6905af3] | committer: Rémi Denis-Courmont

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

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

 modules/hw/vdpau/Makefile.am    |    9 ++++-----
 modules/video_output/Modules.am |   17 +++++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
index 131cd9c..a4e2afa 100644
--- a/modules/hw/vdpau/Makefile.am
+++ b/modules/hw/vdpau/Makefile.am
@@ -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
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index cc3a08b..e55c1e5 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -1,5 +1,6 @@
 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