diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 19 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 5 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/omx/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/va/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/xvmc/Makefile.am | 1 |
9 files changed, 27 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 155f496eb3..351027be3d 100644 --- a/configure.ac +++ b/configure.ac @@ -1572,7 +1572,8 @@ if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then fi fi -if test "x$enable_xvmc" = xyes -o \ +if test "x$enable_dri" = xyes -o \ + "x$enable_xvmc" = xyes -o \ "x$enable_vdpau" = xyes -o \ "x$enable_omx" = xyes -o \ "x$enable_va" = xyes; then diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 1053ce4ee1..453282a960 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -53,9 +53,7 @@ libgalliumvl_stub_la_SOURCES = \ if NEED_GALLIUM_VL -noinst_LTLIBRARIES += libgalliumvl.la - -libgalliumvl_la_CFLAGS = \ +COMMON_VL_CFLAGS = \ $(AM_CFLAGS) \ $(VL_CFLAGS) \ $(LIBDRM_CFLAGS) \ @@ -63,14 +61,27 @@ libgalliumvl_la_CFLAGS = \ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" if HAVE_GALLIUM_STATIC_TARGETS -libgalliumvl_la_CFLAGS += \ +COMMON_VL_CFLAGS += \ -DGALLIUM_STATIC_TARGETS=1 endif # HAVE_GALLIUM_STATIC_TARGETS +noinst_LTLIBRARIES += libgalliumvl.la + +libgalliumvl_la_CFLAGS = \ + $(COMMON_VL_CFLAGS) + libgalliumvl_la_SOURCES = \ $(VL_SOURCES) +noinst_LTLIBRARIES += libgalliumvlwinsys.la + +libgalliumvlwinsys_la_CFLAGS = \ + $(COMMON_VL_CFLAGS) + +libgalliumvlwinsys_la_SOURCES = \ + $(VL_WINSYS_SOURCES) + endif EXTRA_DIST = \ diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index c45dd18a62..d330935b3a 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -334,10 +334,13 @@ VL_SOURCES := \ vl/vl_video_buffer.h \ vl/vl_vlc.h \ vl/vl_winsys.h \ - vl/vl_winsys_dri.c \ vl/vl_zscan.c \ vl/vl_zscan.h +# XXX: Nuke this as our dri targets no longer depend on VL. +VL_WINSYS_SOURCES := \ + vl/vl_winsys_dri.c + VL_STUB_SOURCES := \ vl/vl_stubs.c diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 7f2ce6a6e0..aaeb950707 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -44,7 +44,7 @@ gallium_dri_la_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ $(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \ $(top_builddir)/src/gallium/state_trackers/dri/libdri.la \ - $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ $(top_builddir)/src/gallium/drivers/noop/libnoop.la \ diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index 0ae7c55198..f52e66946e 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -24,6 +24,7 @@ endif # HAVE_LD_VERSION_SCRIPT libomx_mesa_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 3d73a51535..94658f8138 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -40,6 +40,7 @@ PIPE_LIBS = if NEED_GALLIUM_VL PIPE_LIBS += \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la else PIPE_LIBS += \ diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am index 11297e0df7..57c7e353ae 100644 --- a/src/gallium/targets/va/Makefile.am +++ b/src/gallium/targets/va/Makefile.am @@ -25,6 +25,7 @@ endif # HAVE_LD_VERSION_SCRIPT # NOTE: gallium_drv_video does not use(link against) libva gallium_drv_video_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/va/libvatracker.la \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 2980cc310d..9455fc4cae 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -30,6 +30,7 @@ endif # HAVE_LD_DYNAMIC_LIST # NOTE: libvdpau_gallium does not use(link against) libvdpau libvdpau_gallium_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am index 8aed96966b..3c16c8d51e 100644 --- a/src/gallium/targets/xvmc/Makefile.am +++ b/src/gallium/targets/xvmc/Makefile.am @@ -24,6 +24,7 @@ endif # HAVE_LD_VERSION_SCRIPT libXvMCgallium_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ |