From 0484b8446a02a4b77d5a1dab89f6e0b8af831027 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 11 Mar 2014 15:24:07 +0000 Subject: gallium/targets: explicitly include a dummy.cpp and remove all the LINK mayhem Explicitly setting the linker variable was required for old and broken build toolchains. At this point this should no longer be needed, and setting the sources lists will trigger generation of the correct LINK variables. Explicitly include dummy.cpp to use g++ to link the static library which in most cases is based upon C++ code. v2: Reword commit message. Signed-off-by: Emil Velikov Reviewed-by: Matt Turner --- src/gallium/targets/dri-swrast/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/gallium/targets/dri-swrast') diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am index 06eb16aec49..5238459609a 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 \ @@ -54,8 +55,6 @@ 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_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la -- cgit v1.2.3