summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbieri <[email protected]>2010-09-27 14:07:34 +0200
committerLuca Barbieri <[email protected]>2010-09-27 14:11:12 +0200
commit8d0ed47d940ffe2ffdc2ec27a1bab917590e7d9e (patch)
tree0e6350d235001830a2a56f593c717f4f245179e1
parente507e4ec05eb8dda23f7c54aaf2eea143f8e573d (diff)
d3d1x: fix parallel build
-rw-r--r--src/gallium/state_trackers/d3d1x/d3d1xshader/Makefile3
-rw-r--r--src/gallium/state_trackers/d3d1x/gd3d1x/Makefile3
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 3754c23983a..f132518ccc7 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 a1ab425f1a0..32d29563ecc 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