diff options
author | Johannes Obermayr <johannesobermayr@gmx.de> | 2012-12-05 12:24:34 +0100 |
---|---|---|
committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2012-12-17 18:31:00 +0100 |
commit | f13e3ee5e2472d059d1ed9da1197e14c71c588b4 (patch) | |
tree | 03857c3064ca99bfc48b9adf7d67f906bd697735 | |
parent | e0d371f1a27f1edcb4c713d697861d18c66415e2 (diff) |
pipe-loader: Install pipe_* to $(libdir)/gallium-pipe.
-rw-r--r-- | src/gallium/state_trackers/clover/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 20 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am index ee69f89327..80b1ceda58 100644 --- a/src/gallium/state_trackers/clover/Makefile.am +++ b/src/gallium/state_trackers/clover/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS = \ $(GALLIUM_PIPE_LOADER_DEFINES) \ -DMESA_VERSION=\"$(MESA_VERSION)\" \ - -DPIPE_SEARCH_DIR=\"$(OPENCL_LIB_INSTALL_DIR)\" \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/drivers \ diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index be2dd92e3f..278e4fa12b 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -30,7 +30,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gbm/main \ -I$(top_srcdir)/src/gallium/winsys \ $(GALLIUM_PIPE_LOADER_DEFINES) \ - -DPIPE_SEARCH_DIR=\"$(gbmdir)\" + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" AM_CFLAGS = \ $(GALLIUM_CFLAGS) \ diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 1eb773658c..68aa649ebb 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -32,8 +32,8 @@ AM_CPPFLAGS = \ -DGALLIUM_TRACE \ -DGALLIUM_GALAHAD -gbmdir = $(libdir)/gbm -gbm_LTLIBRARIES = +pipedir = $(libdir)/gallium-pipe +pipe_LTLIBRARIES = PIPE_LIBS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ @@ -50,7 +50,7 @@ endif if HAVE_GALLIUM_I915 -gbm_LTLIBRARIES += pipe_i915.la +pipe_LTLIBRARIES += pipe_i915.la pipe_i915_la_SOURCES = pipe_i915.c pipe_i915_la_LIBADD = \ $(PIPE_LIBS) \ @@ -67,7 +67,7 @@ endif endif if HAVE_GALLIUM_NOUVEAU -gbm_LTLIBRARIES += pipe_nouveau.la +pipe_LTLIBRARIES += pipe_nouveau.la pipe_nouveau_la_SOURCES = pipe_nouveau.c nodist_EXTRA_pipe_nouveau_la_SOURCES = dummy.cpp pipe_nouveau_la_LIBADD = \ @@ -86,7 +86,7 @@ endif endif if HAVE_GALLIUM_R300 -gbm_LTLIBRARIES += pipe_r300.la +pipe_LTLIBRARIES += pipe_r300.la pipe_r300_la_SOURCES = pipe_r300.c nodist_EXTRA_pipe_r300_la_SOURCES = dummy.cpp pipe_r300_la_LIBADD = \ @@ -104,7 +104,7 @@ endif endif if HAVE_GALLIUM_R600 -gbm_LTLIBRARIES += pipe_r600.la +pipe_LTLIBRARIES += pipe_r600.la pipe_r600_la_SOURCES = pipe_r600.c pipe_r600_la_LIBADD = \ $(PIPE_LIBS) \ @@ -121,7 +121,7 @@ endif endif if HAVE_GALLIUM_RADEONSI -gbm_LTLIBRARIES += pipe_radeonsi.la +pipe_LTLIBRARIES += pipe_radeonsi.la pipe_radeonsi_la_SOURCES = pipe_radeonsi.c nodist_EXTRA_pipe_radeonsi_la_SOURCES = dummy.cpp pipe_radeonsi_la_LIBADD = \ @@ -138,7 +138,7 @@ endif endif if HAVE_GALLIUM_SVGA -gbm_LTLIBRARIES += pipe_vmwgfx.la +pipe_LTLIBRARIES += pipe_vmwgfx.la pipe_vmwgfx_la_SOURCES = pipe_vmwgfx.c pipe_vmwgfx_la_LIBADD = \ $(PIPE_LIBS) \ @@ -154,7 +154,7 @@ endif endif if HAVE_GALLIUM_LLVMPIPE -gbm_LTLIBRARIES += pipe_swrast.la +pipe_LTLIBRARIES += pipe_swrast.la pipe_swrast_la_SOURCES = pipe_swrast.c nodist_EXTRA_pipe_swrast_la_SOURCES = dummy.cpp pipe_swrast_la_LIBADD = \ @@ -164,7 +164,7 @@ pipe_swrast_la_LIBADD = \ pipe_swrast_la_LDFLAGS = -no-undefined -avoid-version -module $(LLVM_LDFLAGS) else if HAVE_GALLIUM_SOFTPIPE -gbm_LTLIBRARIES += pipe_swrast.la +pipe_LTLIBRARIES += pipe_swrast.la pipe_swrast_la_SOURCES = pipe_swrast.c pipe_swrast_la_LIBADD = \ $(PIPE_LIBS) \ |