diff options
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 19 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 5 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 1053ce4ee1a..453282a9609 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 c45dd18a623..d330935b3ac 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 |