diff options
| author | Tom Stellard <[email protected]> | 2013-09-18 00:36:55 -0700 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2013-10-21 10:47:03 -0700 |
| commit | 07567c17f1eae1feccf160a144fe1563599e5fc0 (patch) | |
| tree | a88dfdc748a1df1fcd96be400a5300dda2f700e2 /src/gallium | |
| parent | 9e0b7f76f95dd45c99e95076badba2c8f123c31a (diff) | |
clover: Prepare the build system for ICD support.
Signed-off-by: Francisco Jerez <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/clover/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am index d0ce68eb214..240a2d0602b 100644 --- a/src/gallium/state_trackers/clover/Makefile.am +++ b/src/gallium/state_trackers/clover/Makefile.am @@ -12,6 +12,10 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/winsys \ -I$(srcdir) +if HAVE_CLOVER_ICD +AM_CPPFLAGS += -DHAVE_CLOVER_ICD +endif + noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la libcltgsi_la_CXXFLAGS = \ diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index 46bb29fffac..cdc7500f315 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -1,12 +1,12 @@ AUTOMAKE_OPTIONS = subdir-objects -lib_LTLIBRARIES = libOpenCL.la +lib_LTLIBRARIES = lib@[email protected] -libOpenCL_la_LDFLAGS = \ +lib@OPENCL_LIBNAME@_la_LDFLAGS = \ $(LLVM_LDFLAGS) \ -version-number 1:0 -libOpenCL_la_LIBADD = \ +lib@OPENCL_LIBNAME@_la_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ $(top_builddir)/src/gallium/state_trackers/clover/libclover.la \ @@ -28,14 +28,13 @@ libOpenCL_la_LIBADD = \ -lclangBasic \ $(LLVM_LIBS) - -libOpenCL_la_SOURCES = +lib@OPENCL_LIBNAME@_la_SOURCES = # Force usage of a C++ linker -nodist_EXTRA_libOpenCL_la_SOURCES = dummy.cpp +nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp # Provide compatibility with scripts for the old Mesa build system for # a while by putting a link to the driver into /lib of the build tree. -all-local: libOpenCL.la +all-local: lib@[email protected] $(MKDIR_P) $(top_builddir)/$(LIB_DIR) - ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/ + ln -f .libs/lib@[email protected]* $(top_builddir)/$(LIB_DIR)/ |