Mesa (master): d3d1x: fix parallel build
Luca Barbieri
lb at kemper.freedesktop.org
Mon Sep 27 12:11:43 UTC 2010
Module: Mesa
Branch: master
Commit: 8d0ed47d940ffe2ffdc2ec27a1bab917590e7d9e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d0ed47d940ffe2ffdc2ec27a1bab917590e7d9e
Author: Luca Barbieri <luca at luca-barbieri.com>
Date: Mon Sep 27 14:07:34 2010 +0200
d3d1x: fix parallel build
---
.../state_trackers/d3d1x/d3d1xshader/Makefile | 3 ++-
src/gallium/state_trackers/d3d1x/gd3d1x/Makefile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile b/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
index 3754c23..f132518 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
+++ b/src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile
@@ -2,7 +2,8 @@ LIBNAME=d3d1xshader
CPP_SOURCES=$(wildcard src/*.cpp) src/sm4_text.cpp
LIBRARY_INCLUDES=-Iinclude -I../d3dapi -I../w32api
PROGS=tools/fxdis
-LIBS=libd3d1xshader.a
+PROGS_DEPS=libd3d1xshader.a
+LIBS=$(PROGS_DEPS)
include ../Makefile.inc
diff --git a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
index a1ab425..32d2956 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
+++ b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
@@ -2,5 +2,6 @@ LIBNAME=gd3d1x
CPP_SOURCES=$(wildcard *.cpp)
LIBRARY_INCLUDES=-Iinclude -I../gd3dapi -I../d3dapi -I../w32api -I../d3d1xstutil/include -I../d3d1xshader/include -I../../../include -I../../../auxiliary -I../../../state_trackers/egl/common
PROGS=tools/dxbc2tgsi
-LIBS=libgd3d1x.a ../d3d1xshader/libd3d1xshader.a ../d3d1xstutil/libd3d1xstutil.a ../../../auxiliary/libgallium.a -ldl
+PROGS_DEPS=libgd3d1x.a ../d3d1xshader/libd3d1xshader.a ../d3d1xstutil/libd3d1xstutil.a ../../../auxiliary/libgallium.a
+LIBS=$(PROGS_DEPS) -ldl
include ../Makefile.inc
More information about the mesa-commit
mailing list