summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-10-14 15:25:54 +0100
committerEmil Velikov <[email protected]>2014-10-14 16:16:08 +0100
commitaf897df5083fc94d5a2a011de9894fa1aa852fe2 (patch)
tree2292f3f547d85ac3d452e28c016c86444a7657d7
parenta2d8b6dbd5359e5dc930e22ac21a92bf20587401 (diff)
automake: explicitly set TARGET_RADEON_{WINSYS,COMMON}
Originally the variables were set only once via the ?= operator but that causes issues when doing incremental builds. They appear to be undefined and missing from the dependency list despite their addition to LIBADD. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84807 Signed-off-by: Emil Velikov <[email protected]>
-rw-r--r--src/gallium/drivers/r300/Automake.inc2
-rw-r--r--src/gallium/drivers/r600/Automake.inc4
-rw-r--r--src/gallium/drivers/radeonsi/Automake.inc4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/r300/Automake.inc b/src/gallium/drivers/r300/Automake.inc
index 42614cb347b..93349731a49 100644
--- a/src/gallium/drivers/r300/Automake.inc
+++ b/src/gallium/drivers/r300/Automake.inc
@@ -7,7 +7,7 @@ TARGET_LIB_DEPS += \
$(RADEON_LIBS) \
$(INTEL_LIBS)
-TARGET_RADEON_WINSYS ?= \
+TARGET_RADEON_WINSYS = \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
endif
diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc
index 014f4156fe6..914eea3dc54 100644
--- a/src/gallium/drivers/r600/Automake.inc
+++ b/src/gallium/drivers/r600/Automake.inc
@@ -7,10 +7,10 @@ TARGET_LIB_DEPS += \
$(RADEON_LIBS) \
$(LIBDRM_LIBS)
-TARGET_RADEON_WINSYS ?= \
+TARGET_RADEON_WINSYS = \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
-TARGET_RADEON_COMMON ?= \
+TARGET_RADEON_COMMON = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la
endif
diff --git a/src/gallium/drivers/radeonsi/Automake.inc b/src/gallium/drivers/radeonsi/Automake.inc
index 3f212b39769..8686fffd71c 100644
--- a/src/gallium/drivers/radeonsi/Automake.inc
+++ b/src/gallium/drivers/radeonsi/Automake.inc
@@ -7,10 +7,10 @@ TARGET_LIB_DEPS += \
$(RADEON_LIBS) \
$(LIBDRM_LIBS)
-TARGET_RADEON_WINSYS ?= \
+TARGET_RADEON_WINSYS = \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la
-TARGET_RADEON_COMMON ?= \
+TARGET_RADEON_COMMON = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la
endif