diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-11-16 18:50:57 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-11-16 18:50:57 +0100 |
| commit | 4f0537e645f9c34e305f2808c70eafbbc1c7689c (patch) | |
| tree | 3251e18ec93257bd4f1d6bf60459b71aa129abc1 /src/gallium/targets/pipe-loader | |
| parent | 6346214f055126d421a20c40056e3abe8ce1f9f3 (diff) | |
| download | external_mesa3d-4f0537e645f9c34e305f2808c70eafbbc1c7689c.zip external_mesa3d-4f0537e645f9c34e305f2808c70eafbbc1c7689c.tar.gz external_mesa3d-4f0537e645f9c34e305f2808c70eafbbc1c7689c.tar.bz2 | |
[PATCH] makefiles: use configured name for -ldrm* where possible
For precise lts support I had to do some magic with the library names, which works fine
as long as the libraries from pkg-config are used.
The parts with src/gallium/targets/va-*/Makefile will not apply on the master branch,
but do apply to the 9.0 branch.
NOTE: This is a candidate for the 9.0 branch.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/gallium/targets/pipe-loader')
| -rw-r--r-- | src/gallium/targets/pipe-loader/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/targets/pipe-loader/Makefile b/src/gallium/targets/pipe-loader/Makefile index 596539c..f15cd25 100644 --- a/src/gallium/targets/pipe-loader/Makefile +++ b/src/gallium/targets/pipe-loader/Makefile @@ -24,7 +24,7 @@ PIPE_LIBS = \ $(TOP)/src/gallium/drivers/rbug/librbug.a \ $(GALLIUM_AUXILIARIES) -PIPE_SYS = $(LIBDRM_LIB) -lm -lpthread $(DLOPEN_LIBS) +PIPE_SYS = $(LIBDRM_LIBS) -lm -lpthread $(DLOPEN_LIBS) PIPE_CFLAGS = $(LIBDRM_CFLAGS) @@ -34,7 +34,7 @@ PIPE_LDFLAGS = -Wl,--no-undefined i915_LIBS = \ $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \ $(TOP)/src/gallium/drivers/i915/libi915.a -i915_SYS = -ldrm_intel +i915_SYS = $(INTEL_LIBS) # nouveau pipe driver nouveau_LIBS = \ @@ -43,25 +43,25 @@ nouveau_LIBS = \ $(TOP)/src/gallium/drivers/nv50/libnv50.a \ $(TOP)/src/gallium/drivers/nvc0/libnvc0.a \ $(TOP)/src/gallium/drivers/nouveau/libnouveau.a -nouveau_SYS = -ldrm_nouveau +nouveau_SYS = $(NOUVEAU_LIBS) # r300 pipe driver r300_LIBS = \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r300/libr300.a -r300_SYS += -ldrm_radeon +r300_SYS += $(RADEON_LIBS) # r600 pipe driver r600_LIBS = \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r600/libr600.a -r600_SYS += -ldrm_radeon +r600_SYS += $(RADEON_LIBS) # radeonsi pipe driver radeonsi_LIBS = \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/radeonsi/libradeonsi.a -radeonsi_SYS += -ldrm_radeon +radeonsi_SYS += $(RADEON_LIBS) # vmwgfx pipe driver vmwgfx_LIBS = \ |