diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-09-13 10:45:01 -0700 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-01-10 22:01:30 +0100 |
| commit | 45270fb0fd1abd7619933c2845f9dc74cdfbe6fd (patch) | |
| tree | b7765f6f7b5df3fc43fc9354d1b245be76f61a78 /src/gallium/targets/opencl | |
| parent | 53c62d3fb0ee9aacc7a4aa08b4c42a3fb2127b2f (diff) | |
| download | external_mesa3d-45270fb0fd1abd7619933c2845f9dc74cdfbe6fd.zip external_mesa3d-45270fb0fd1abd7619933c2845f9dc74cdfbe6fd.tar.gz external_mesa3d-45270fb0fd1abd7619933c2845f9dc74cdfbe6fd.tar.bz2 | |
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 <johannesobermayr@gmx.de>
- Fix some undefined symbols.
v3: Johannes Obermayr <johannesobermayr@gmx.de>
- Install pipe_* to $(libdir)/gallium-pipe.
v4: Johannes Obermayr <johannesobermayr@gmx.de>
- Build it only once on --enable-gallium-gbm / --enable-opencl.
Diffstat (limited to 'src/gallium/targets/opencl')
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index e4324f8..311363e 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 |