From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue, 14 Oct 2014 14:25:54 +0000 (+0100)
Subject: automake: explicitly set TARGET_RADEON_{WINSYS,COMMON}
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af897df5083fc94d5a2a011de9894fa1aa852fe2;p=mesa.git

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 <emil.l.velikov@gmail.com>
---

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