From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue, 11 Mar 2014 01:56:04 +0000 (+0000)
Subject: targets/pipe-loader: include dummy.cpp irrespective of HAVE_MESA_LLVM
X-Git-Tag: upstream/10.3~2856
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e36cc998803c775df084d258e09183d0b31cff04;p=platform%2Fupstream%2Fmesa.git

targets/pipe-loader: include dummy.cpp irrespective of HAVE_MESA_LLVM

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 73e43e0..8e76d41 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -58,6 +58,7 @@ endif
 if HAVE_GALLIUM_I915
 pipe_LTLIBRARIES += pipe_i915.la
 pipe_i915_la_SOURCES = pipe_i915.c
+nodist_EXTRA_pipe_i915_la_SOURCES = dummy.cpp
 pipe_i915_la_LIBADD = \
 	$(PIPE_LIBS) \
 	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
@@ -66,7 +67,6 @@ pipe_i915_la_LIBADD = \
 	$(INTEL_LIBS)
 
 if HAVE_MESA_LLVM
-nodist_EXTRA_pipe_i915_la_SOURCES = dummy.cpp
 pipe_i915_la_LIBADD += $(LLVM_LIBS)
 endif
 endif
@@ -107,6 +107,7 @@ endif
 if HAVE_GALLIUM_R600
 pipe_LTLIBRARIES += pipe_r600.la
 pipe_r600_la_SOURCES = pipe_r600.c
+nodist_EXTRA_pipe_r600_la_SOURCES = dummy.cpp
 pipe_r600_la_LIBADD = \
 	$(PIPE_LIBS) \
 	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
@@ -115,7 +116,6 @@ pipe_r600_la_LIBADD = \
 	$(RADEON_LIBS)
 
 if HAVE_MESA_LLVM
-nodist_EXTRA_pipe_r600_la_SOURCES = dummy.cpp
 pipe_r600_la_LIBADD += $(LLVM_LIBS)
 endif
 endif
@@ -155,6 +155,7 @@ endif
 if HAVE_GALLIUM_SVGA
 pipe_LTLIBRARIES += pipe_vmwgfx.la
 pipe_vmwgfx_la_SOURCES = pipe_vmwgfx.c
+nodist_EXTRA_pipe_vmwgfx_la_SOURCES = dummy.cpp
 pipe_vmwgfx_la_LIBADD = \
 	$(PIPE_LIBS) \
 	$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
@@ -162,7 +163,6 @@ pipe_vmwgfx_la_LIBADD = \
 	$(LIBDRM_LIBS)
 
 if HAVE_MESA_LLVM
-nodist_EXTRA_pipe_vmwgfx_la_SOURCES = dummy.cpp
 pipe_vmwgfx_la_LIBADD += $(LLVM_LIBS)
 endif
 endif
@@ -172,6 +172,7 @@ AM_CPPFLAGS += -DGALLIUM_SOFTPIPE
 
 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) \
 	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
@@ -179,8 +180,6 @@ pipe_swrast_la_LIBADD = \
 if HAVE_GALLIUM_LLVMPIPE
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
 
-nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp
-
 pipe_swrast_la_LIBADD += \
 	$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la \
 	$(LLVM_LIBS)