From 45270fb0fd1abd7619933c2845f9dc74cdfbe6fd Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 13 Sep 2012 10:45:01 -0700 Subject: targets/pipe-loader: Convert to automake C++ linking (controlled by the nodist_EXTRA idiom) is needed unconditionally for: nouveau (uses C++ in the driver) r300 (since LLVM is always required) radeonsi (since LLVM is always required) swrast (if builting LLVM pipe) and conditionally (depends whether LLVM is enabled) for i915 r600 vmwgfx and never needed for swrast (softpipe). Unfortunately, automake seems to *always* link with C++ if nodist_EXTRA is specified, even inside a false conditional. Not sure if this is a bug, but it does seem to be weird behavior. v2: Johannes Obermayr - Fix some undefined symbols. v3: Johannes Obermayr - Install pipe_* to $(libdir)/gallium-pipe. v4: Johannes Obermayr - Build it only once on --enable-gallium-gbm / --enable-opencl. --- src/gallium/targets/opencl/Makefile.am | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/gallium/targets/opencl/Makefile.am') diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index e4324f87908..311363e3437 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -41,12 +41,6 @@ all-local: libOpenCL.la $(MKDIR_P) $(top_builddir)/$(LIB_DIR) ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/ -install-exec-local: - @$(MAKE) -C $(PIPE_SRC_DIR) PIPE_INSTALL_DIR=$(OPENCL_LIB_INSTALL_DIR) install - -clean-local: - @$(MAKE) -C $(PIPE_SRC_DIR) clean - # FIXME: Remove when the rest of Gallium is converted to automake. TOP=$(top_builddir) default: all -- cgit v1.2.3