video_output: remove makefile recursion

configure.ac

@@ -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

modules/Makefile.am

@@ -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
 

modules/hw/vdpau/Makefile.am

@@ -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