automake: introduce GALLIUM_COMMON_LIB_DEPS
Rather than copying the core four dependencies all over gallium, introduce the above variable to avoid all the duplication. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76848 Tested-by: Vinson Lee <vlee@freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
parent
16c13aaeb8
commit
ba5eba5008
|
@ -86,24 +86,24 @@ GALLIUM_OMX_LINKER_FLAGS = \
|
||||||
$(GC_SECTIONS) \
|
$(GC_SECTIONS) \
|
||||||
-Wl,--no-undefined
|
-Wl,--no-undefined
|
||||||
|
|
||||||
GALLIUM_DRI_LIB_DEPS = \
|
GALLIUM_COMMON_LIB_DEPS = \
|
||||||
$(SELINUX_LIBS) \
|
|
||||||
$(LIBDRM_LIBS) \
|
|
||||||
$(EXPAT_LIBS) \
|
|
||||||
-lm \
|
-lm \
|
||||||
$(CLOCK_LIB) \
|
$(CLOCK_LIB) \
|
||||||
$(PTHREAD_LIBS) \
|
$(PTHREAD_LIBS) \
|
||||||
$(DLOPEN_LIBS)
|
$(DLOPEN_LIBS)
|
||||||
|
|
||||||
|
GALLIUM_DRI_LIB_DEPS = \
|
||||||
|
$(SELINUX_LIBS) \
|
||||||
|
$(LIBDRM_LIBS) \
|
||||||
|
$(EXPAT_LIBS) \
|
||||||
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
|
|
||||||
GALLIUM_VDPAU_LIB_DEPS = \
|
GALLIUM_VDPAU_LIB_DEPS = \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
|
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
|
||||||
$(VDPAU_LIBS) \
|
$(VDPAU_LIBS) \
|
||||||
$(LIBDRM_LIBS) \
|
$(LIBDRM_LIBS) \
|
||||||
-lm \
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
$(CLOCK_LIB) \
|
|
||||||
$(PTHREAD_LIBS) \
|
|
||||||
$(DLOPEN_LIBS)
|
|
||||||
|
|
||||||
GALLIUM_XVMC_LIB_DEPS = \
|
GALLIUM_XVMC_LIB_DEPS = \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
|
|
|
@ -69,10 +69,7 @@ egl_gallium_la_LIBADD = \
|
||||||
$(top_builddir)/src/gallium/state_trackers/egl/libegl.la \
|
$(top_builddir)/src/gallium/state_trackers/egl/libegl.la \
|
||||||
$(top_builddir)/src/egl/main/libEGL.la \
|
$(top_builddir)/src/egl/main/libEGL.la \
|
||||||
$(top_builddir)/src/loader/libloader.la \
|
$(top_builddir)/src/loader/libloader.la \
|
||||||
$(CLOCK_LIB) \
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
$(DLOPEN_LIBS) \
|
|
||||||
$(PTHREAD_LIBS) \
|
|
||||||
-lm
|
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_MESA_LLVM
|
||||||
AM_LDFLAGS += $(LLVM_LDFLAGS)
|
AM_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
|
@ -139,10 +136,7 @@ st_GL_la_LIBADD = \
|
||||||
$(top_builddir)/src/mesa/libmesagallium.la \
|
$(top_builddir)/src/mesa/libmesagallium.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(top_builddir)/src/mapi/glapi/libglapi.la \
|
$(top_builddir)/src/mapi/glapi/libglapi.la \
|
||||||
$(CLOCK_LIB) \
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
$(DLOPEN_LIBS) \
|
|
||||||
$(PTHREAD_LIBS) \
|
|
||||||
-lm
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -49,10 +49,7 @@ gbm_gallium_drm_la_LIBADD = \
|
||||||
$(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \
|
$(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(LIBDRM_LIBS) \
|
$(LIBDRM_LIBS) \
|
||||||
-lm \
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
$(CLOCK_LIB) \
|
|
||||||
$(PTHREAD_LIBS) \
|
|
||||||
$(DLOPEN_LIBS)
|
|
||||||
|
|
||||||
if HAVE_DRI
|
if HAVE_DRI
|
||||||
gbm_gallium_drm_la_LIBADD += \
|
gbm_gallium_drm_la_LIBADD += \
|
||||||
|
|
|
@ -40,10 +40,7 @@ PIPE_LIBS = \
|
||||||
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
|
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
|
||||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
||||||
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
|
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
|
||||||
-lm \
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
$(CLOCK_LIB) \
|
|
||||||
$(PTHREAD_LIBS) \
|
|
||||||
$(DLOPEN_LIBS)
|
|
||||||
|
|
||||||
AM_LDFLAGS = \
|
AM_LDFLAGS = \
|
||||||
-module \
|
-module \
|
||||||
|
|
|
@ -46,11 +46,7 @@ libxatracker_la_LIBADD = \
|
||||||
$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
|
$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(LIBDRM_LIBS) \
|
$(LIBDRM_LIBS) \
|
||||||
-lm \
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
$(CLOCK_LIB) \
|
|
||||||
$(PTHREAD_LIBS) \
|
|
||||||
$(DLOPEN_LIBS)
|
|
||||||
|
|
||||||
|
|
||||||
if HAVE_DRI
|
if HAVE_DRI
|
||||||
libxatracker_la_LIBADD += \
|
libxatracker_la_LIBADD += \
|
||||||
|
|
|
@ -16,9 +16,7 @@ LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
|
||||||
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
|
$(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
|
||||||
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
||||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||||
$(DLOPEN_LIBS) \
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
$(PTHREAD_LIBS) \
|
|
||||||
-lm
|
|
||||||
|
|
||||||
if NEED_PIPE_LOADER_XLIB
|
if NEED_PIPE_LOADER_XLIB
|
||||||
LDADD += \
|
LDADD += \
|
||||||
|
|
|
@ -14,9 +14,7 @@ LDADD = \
|
||||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
||||||
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
||||||
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
|
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
|
||||||
$(DLOPEN_LIBS) \
|
$(GALLIUM_COMMON_LIB_DEPS)
|
||||||
$(PTHREAD_LIBS) \
|
|
||||||
-lm
|
|
||||||
|
|
||||||
noinst_PROGRAMS = pipe_barrier_test u_cache_test u_half_test \
|
noinst_PROGRAMS = pipe_barrier_test u_cache_test u_half_test \
|
||||||
u_format_test u_format_compatible_test translate_test
|
u_format_test u_format_compatible_test translate_test
|
||||||
|
|
Loading…
Reference in New Issue