X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Ftargets%2Fdri-swrast%2FMakefile.am;h=4e2ecf239007e88f5369700946f1283ffcca8969;hb=822ac968024b1f1aacb729e25b811908237e3beb;hp=e05e99ddeca314b6c11dd93fe51502b8c0ffb9f8;hpb=ce24bcd39409f5d734dd5ea845539e4b5b70eaf0;p=mesa.git diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am index e05e99ddeca..4e2ecf23900 100644 --- a/src/gallium/targets/dri-swrast/Makefile.am +++ b/src/gallium/targets/dri-swrast/Makefile.am @@ -36,6 +36,7 @@ AM_CPPFLAGS = \ dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = swrast_dri.la +nodist_EXTRA_swrast_dri_la_SOURCES = dummy.cpp swrast_dri_la_SOURCES = \ swrast_drm_api.c \ $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \ @@ -45,8 +46,6 @@ swrast_dri_la_SOURCES = \ swrast_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS) swrast_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ @@ -54,12 +53,9 @@ swrast_dri_la_LIBADD = \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(GALLIUM_DRI_LIB_DEPS) -nodist_EXTRA_swrast_dri_la_SOURCES = dummy.cpp - if HAVE_MESA_LLVM AM_CPPFLAGS += -DGALLIUM_LLVMPIPE -swrast_dri_la_LDFLAGS += $(LLVM_LDFLAGS) -swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) +swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la endif include $(top_srcdir)/install-gallium-links.mk