pipe-loader: fix build of dynamic pipe-drivers

[mesa.git] / src / gallium / targets / pipe-loader / Makefile.am

diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 93e497f9943f50eeca87ecc1bd94a7fc61e78417..db492c5023d9143e8ac47b232808a9e2fb5ce14a 100644 (file)
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -27,33 +27,52 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/drivers \
        -I$(top_srcdir)/src/gallium/winsys \
+       -I$(top_builddir)/src/util \
+       $(GALLIUM_PIPE_LOADER_DEFINES) \
        $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS) \
        -DGALLIUM_RBUG \
-       -DGALLIUM_TRACE \
-       -DGALLIUM_GALAHAD
+       -DGALLIUM_TRACE
 
 pipedir = $(libdir)/gallium-pipe
 pipe_LTLIBRARIES =
 
-PIPE_LIBS = \
+PIPE_LIBS =
+
+if NEED_GALLIUM_VL
+PIPE_LIBS += \
+       $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la
+else
+PIPE_LIBS += \
+       $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la
+endif
+
+if NEED_GALLIUM_VL_WINSYS
+PIPE_LIBS+= \
+       $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la
+endif
+
+PIPE_LIBS += \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+       $(top_builddir)/src/compiler/nir/libnir.la \
+       $(top_builddir)/src/util/libmesautil.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
-       $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
        $(GALLIUM_COMMON_LIB_DEPS)
 
 AM_LDFLAGS = \
        -module \
        -no-undefined \
        -avoid-version \
-if HAVE_LD_VERSION_SCRIPT
-       -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.sym \
-endif
        $(GC_SECTIONS) \
        $(LD_NO_UNDEFINED)
 
-if HAVE_MESA_LLVM
+if HAVE_LD_VERSION_SCRIPT
+AM_LDFLAGS += \
+       -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.sym
+endif
+
+if HAVE_GALLIUM_LLVM
 PIPE_LIBS += $(LLVM_LIBS)
 AM_LDFLAGS += $(LLVM_LDFLAGS)
 endif
@@ -68,7 +87,7 @@ pipe_i915_la_LIBADD = \
        $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
        $(top_builddir)/src/gallium/drivers/i915/libi915.la \
        $(LIBDRM_LIBS) \
-       $(INTEL_LIBS)
+       $(I915_LIBS)
 
 endif
 
@@ -94,7 +113,6 @@ nodist_EXTRA_pipe_r300_la_SOURCES = dummy.cpp
 pipe_r300_la_LIBADD = \
        $(PIPE_LIBS) \
        $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-       $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \
        $(top_builddir)/src/gallium/drivers/r300/libr300.la \
        $(LIBDRM_LIBS) \
        $(RADEON_LIBS)
@@ -112,8 +130,8 @@ pipe_r600_la_LIBADD = \
        $(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
        $(top_builddir)/src/gallium/drivers/r600/libr600.la \
        $(LIBDRM_LIBS) \
-       $(RADEON_LIBS)
-
+       $(RADEON_LIBS) \
+       $(LIBELF_LIBS)
 endif
 
 if HAVE_GALLIUM_RADEONSI
@@ -124,10 +142,14 @@ nodist_EXTRA_pipe_radeonsi_la_SOURCES = dummy.cpp
 pipe_radeonsi_la_LIBADD = \
        $(PIPE_LIBS) \
        $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
+       $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la \
        $(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
        $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
+       $(top_builddir)/src/amd/common/libamd_common.la \
+       $(top_builddir)/src/util/libxmlconfig.la \
        $(LIBDRM_LIBS) \
-       $(RADEON_LIBS)
+       $(RADEON_LIBS) \
+       $(AMDGPU_LIBS)
 
 endif
 
@@ -159,16 +181,18 @@ pipe_vmwgfx_la_LIBADD = \
 
 endif
 
-if HAVE_GALLIUM_SOFTPIPE
-AM_CPPFLAGS += -DGALLIUM_SOFTPIPE
-
+if HAVE_GALLIUM_SWRAST
 pipe_LTLIBRARIES += pipe_swrast.la
 pipe_swrast_la_SOURCES = pipe_swrast.c
 nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp
+pipe_swrast_la_LIBADD = $(PIPE_LIBS)
 
-pipe_swrast_la_LIBADD = \
-       $(PIPE_LIBS) \
+if HAVE_GALLIUM_SOFTPIPE
+AM_CPPFLAGS += -DGALLIUM_SOFTPIPE
+
+pipe_swrast_la_LIBADD += \
        $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
+endif
 
 if HAVE_GALLIUM_LLVMPIPE
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
@@ -176,4 +200,17 @@ AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
 pipe_swrast_la_LIBADD += \
        $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
 endif
+
+if HAVE_GALLIUM_SWR
+AM_CPPFLAGS += -DGALLIUM_SWR
+
+pipe_swrast_la_LIBADD += \
+       $(top_builddir)/src/gallium/drivers/swr/libmesaswr.la
 endif
+
+pipe_swrast_la_LIBADD += \
+       $(GALLIUM_PIPE_LOADER_WINSYS_LIBS)
+
+endif
+
+EXTRA_DIST = pipe.sym