From af897df5083fc94d5a2a011de9894fa1aa852fe2 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 14 Oct 2014 15:25:54 +0100 Subject: [PATCH] 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 --- src/gallium/drivers/r300/Automake.inc | 2 +- src/gallium/drivers/r600/Automake.inc | 4 ++-- src/gallium/drivers/radeonsi/Automake.inc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/r300/Automake.inc b/src/gallium/drivers/r300/Automake.inc index 42614cb..9334973 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 014f415..914eea3 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 3f212b3..8686fff 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 -- 2.7.4