[vlc-commits] vdpau: remove makefile recursion

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 28 16:15:58 2013 +0300| [1ee7d9d83ee7e128737a3b4cde9cdcd9be68e876] | committer: Rémi Denis-Courmont

vdpau: remove makefile recursion

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

 configure.ac                 |    1 -
 modules/Makefile.am          |    5 +---
 modules/hw/vdpau/Makefile.am |   54 +++++++++++++++++++-----------------------
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0088f82..3953f7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4264,7 +4264,6 @@ AC_CONFIG_FILES([
   modules/text_renderer/Makefile
   modules/video_filter/Makefile
   modules/visualization/Makefile
-  modules/hw/vdpau/Makefile
   modules/hw/mmal/Makefile
 ])
 
diff --git a/modules/Makefile.am b/modules/Makefile.am
index a53eecc..663bf48 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -16,7 +16,6 @@ EXTRA_SUBDIRS = \
 	access_output \
 	mux \
 	stream_out \
-	hw/vdpau \
 	hw/mmal
 
 SUBDIRS = . $(BASE_SUBDIRS)
@@ -24,9 +23,6 @@ DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 if ENABLE_SOUT
 SUBDIRS += access_output mux stream_out
 endif
-if HAVE_VDPAU
-SUBDIRS += hw/vdpau
-endif
 if HAVE_MMAL
 SUBDIRS += hw/mmal
 endif
@@ -45,6 +41,7 @@ include audio_mixer/Makefile.am
 include audio_output/Makefile.am
 include codec/Makefile.am
 include demux/Makefile.am
+include hw/vdpau/Makefile.am
 include lua/Makefile.am
 include meta_engine/Makefile.am
 include notify/Makefile.am
diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
index 43b2a41..577befd 100644
--- a/modules/hw/vdpau/Makefile.am
+++ b/modules/hw/vdpau/Makefile.am
@@ -1,10 +1,7 @@
-include $(top_srcdir)/modules/common.am
 vdpaudir = $(pluginsdir)/vdpau
 
-AM_CFLAGS += $(VDPAU_CFLAGS)
-
-libvlc_vdpau_la_SOURCES = vlc_vdpau.c vlc_vdpau.h instance.c
-libvlc_vdpau_la_CPPFLAGS =
+libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h hw/vdpau/instance.c
+libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS)
 libvlc_vdpau_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) -lX11 \
 	$(LIBDL) $(LIBPTHREAD)
 libvlc_vdpau_la_LDFLAGS = \
@@ -13,41 +10,38 @@ libvlc_vdpau_la_LDFLAGS = \
 	-version-info 0:0:0
 pkglib_LTLIBRARIES = libvlc_vdpau.la
 
-vdpau_LTLIBRARIES =
-
-libvdpau_avcodec_plugin_la_SOURCES = avcodec.c picture.c
+libvdpau_avcodec_plugin_la_SOURCES = hw/vdpau/avcodec.c hw/vdpau/picture.c
 libvdpau_avcodec_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(X_CFLAGS) $(AVCODEC_CFLAGS)
+	$(X_CFLAGS) $(AVCODEC_CFLAGS) $(VDPAU_CFLAGS)
 libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la \
 	$(X_LIBS) $(X_PRE_LIBS) -lX11 $(AVCODEC_LIBS)
-if HAVE_AVCODEC_VDPAU
-vdpau_LTLIBRARIES += libvdpau_avcodec_plugin.la
-endif
 
-libvdpau_deinterlace_plugin_la_SOURCES = deinterlace.c picture.c
-libvdpau_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
+libvdpau_deinterlace_plugin_la_SOURCES = hw/vdpau/deinterlace.c hw/vdpau/picture.c
+libvdpau_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
 libvdpau_deinterlace_plugin_la_LIBADD = libvlc_vdpau.la
-vdpau_LTLIBRARIES += libvdpau_deinterlace_plugin.la
 
-libvdpau_adjust_plugin_la_SOURCES = adjust.c picture.c
-libvdpau_adjust_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
+libvdpau_adjust_plugin_la_SOURCES = hw/vdpau/adjust.c hw/vdpau/picture.c
+libvdpau_adjust_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
 libvdpau_adjust_plugin_la_LIBADD = libvlc_vdpau.la
-vdpau_LTLIBRARIES += libvdpau_adjust_plugin.la
 
-libvdpau_sharpen_plugin_la_SOURCES = sharpen.c picture.c
-libvdpau_sharpen_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
+libvdpau_sharpen_plugin_la_SOURCES = hw/vdpau/sharpen.c hw/vdpau/picture.c
+libvdpau_sharpen_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
 libvdpau_sharpen_plugin_la_LIBADD = libvlc_vdpau.la
-vdpau_LTLIBRARIES += libvdpau_sharpen_plugin.la
 
-libvdpau_chroma_plugin_la_SOURCES = chroma.c picture.c
-libvdpau_chroma_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
+libvdpau_chroma_plugin_la_SOURCES = hw/vdpau/chroma.c hw/vdpau/picture.c
+libvdpau_chroma_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
 libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
-vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la
 
-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 \
-	../../libvlc_xcb_events.la \
+libvdpau_display_plugin_la_SOURCES = hw/vdpau/display.c
+libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/video_output/xcb
+libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(VDPAU_CFLAGS)
+libvdpau_display_plugin_la_LIBADD = libvlc_vdpau.la libvlc_xcb_events.la \
 	$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
-vdpau_LTLIBRARIES += libvdpau_display_plugin.la
+
+if HAVE_VDPAU
+vdpau_LTLIBRARIES = libvdpau_deinterlace_plugin.la libvdpau_adjust_plugin.la \
+	libvdpau_sharpen_plugin.la libvdpau_chroma_plugin.la libvdpau_display_plugin.la
+if HAVE_AVCODEC_VDPAU
+vdpau_LTLIBRARIES += libvdpau_avcodec_plugin.la
+endif
+endif