targets/dri: move common libraries to GALLIUM_DRI_LIB_DEPS

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index dba3086a78806abb9559c2814d3b30ec3c429caa..7b75a928843da8d3f0f7073ddd9ede5bad7468f0 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -93,6 +93,8 @@ GALLIUM_COMMON_LIB_DEPS = \
        $(DLOPEN_LIBS)
 
 GALLIUM_DRI_LIB_DEPS = \
+       $(top_builddir)/src/mesa/libmesagallium.la \
+       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(SELINUX_LIBS) \
        $(LIBDRM_LIBS) \
        $(EXPAT_LIBS) \

diff --git a/src/gallium/targets/dri-freedreno/Makefile.am b/src/gallium/targets/dri-freedreno/Makefile.am
index 6347a552f077d4dad13995a060fffc149df13654..23db169d81c0f983ba1efa6b0de975ef15a8deee 100644 (file)
--- a/src/gallium/targets/dri-freedreno/Makefile.am
+++ b/src/gallium/targets/dri-freedreno/Makefile.am
@@ -36,8 +36,6 @@ COMMON_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
 
 COMMON_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \
        $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \

diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am
index d51144da3b7c730661db1e32965ca6eaedc90077..6abbcaa760499dff4dc2d0e8a64dc3ec24f7e8fe 100644 (file)
--- a/src/gallium/targets/dri-i915/Makefile.am
+++ b/src/gallium/targets/dri-i915/Makefile.am
@@ -40,8 +40,6 @@ i915_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
 
 i915_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
        $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \

diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am
index d38dcdc3d00be83988782671378ee609f640f8ca..41eab06bcdb86975edc987fd0fef11cae0e679a7 100644 (file)
--- a/src/gallium/targets/dri-ilo/Makefile.am
+++ b/src/gallium/targets/dri-ilo/Makefile.am
@@ -40,8 +40,6 @@ ilo_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
 
 ilo_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \
        $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \

diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
index b2a577c4acda7b13e1a480a422e5cd9e6af341a8..6c749bcaffcedd962349ba2888b524bf0cf2cad2 100644 (file)
--- a/src/gallium/targets/dri-nouveau/Makefile.am
+++ b/src/gallium/targets/dri-nouveau/Makefile.am
@@ -41,8 +41,6 @@ nouveau_dri_la_LDFLAGS = \
 
 nouveau_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \

diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
index 5238459609ae9d4350b0251aa41510b1182c43d9..4e2ecf239007e88f5369700946f1283ffcca8969 100644 (file)
--- a/src/gallium/targets/dri-swrast/Makefile.am
+++ b/src/gallium/targets/dri-swrast/Makefile.am
@@ -46,8 +46,6 @@ swrast_dri_la_SOURCES = \
 swrast_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
 
 swrast_dri_la_LIBADD = \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \
        $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
        $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \

diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
index ee5f07bee5ef6af62bf2d828781329b4548e4188..58a36306be83062e1eec506e9e1f400b81953fdd 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/Makefile.am
+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
@@ -40,8 +40,6 @@ vmwgfx_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
 
 vmwgfx_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
        $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la \

diff --git a/src/gallium/targets/r300/dri/Makefile.am b/src/gallium/targets/r300/dri/Makefile.am
index a95b97c7f9285ecfb36b84e1a5506c705575255c..26505447dd13b78b87afc73e8b6a303bca2f8b2c 100644 (file)
--- a/src/gallium/targets/r300/dri/Makefile.am
+++ b/src/gallium/targets/r300/dri/Makefile.am
@@ -43,8 +43,6 @@ r300_dri_la_LDFLAGS = \
 
 r300_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
        $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \

diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am
index f828a734379dcd645700af508e626bea96d14e99..697abacb954db0152e65896a5c1ceea2221ed810 100644 (file)
--- a/src/gallium/targets/r600/dri/Makefile.am
+++ b/src/gallium/targets/r600/dri/Makefile.am
@@ -43,8 +43,6 @@ r600_dri_la_LDFLAGS = \
 
 r600_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/drivers/r600/libr600.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \

diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am
index 33b5b7f5594fbe05f883df8c24afc3f4012089a9..4f362977d7eecfd9667725e27bcaac6a83fbeb12 100644 (file)
--- a/src/gallium/targets/radeonsi/dri/Makefile.am
+++ b/src/gallium/targets/radeonsi/dri/Makefile.am
@@ -43,8 +43,6 @@ radeonsi_dri_la_LDFLAGS = \
 
 radeonsi_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
        $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \