X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FAutomake.inc;h=97735abe0c25ccdb64e60dea79ad2cdcbaf0e453;hb=665a4d9d9b883324dbe9ba7ff55c9cb8201bc6b3;hp=b4fdfe85588ab5cb308a4e3bc26acc9b9cf6e966;hpb=6b410430508457e1a975210eecafea5e600408cf;p=mesa.git diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index b4fdfe85588..97735abe0c2 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -51,40 +51,51 @@ GALLIUM_VIDEO_CFLAGS = \ $(VISIBILITY_CFLAGS) -DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link - GALLIUM_DRI_LINKER_FLAGS = \ -shared \ + -shrext .so \ -module \ -avoid-version \ - $(GC_SECTIONS) \ - -Wl,--version-script=$(DRI_VERSION_SCRIPT) + $(GC_SECTIONS) GALLIUM_VDPAU_LINKER_FLAGS = \ -shared \ -module \ -no-undefined \ -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - -export-symbols-regex $(VDPAU_EXPORTS) \ $(GC_SECTIONS) \ - -Wl,--no-undefined + $(LD_NO_UNDEFINED) GALLIUM_XVMC_LINKER_FLAGS = \ -shared \ -module \ -no-undefined \ -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \ - -export-symbols-regex '^XvMC' \ $(GC_SECTIONS) \ - -Wl,--no-undefined + $(LD_NO_UNDEFINED) GALLIUM_OMX_LINKER_FLAGS = \ -shared \ -module \ -no-undefined \ - -export-symbols-regex $(EXPORTS) \ + -avoid-version \ $(GC_SECTIONS) \ - -Wl,--no-undefined + $(LD_NO_UNDEFINED) + +if HAVE_LD_VERSION_SCRIPT +GALLIUM_DRI_LINKER_FLAGS += \ + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym + +GALLIUM_VDPAU_LINKER_FLAGS += \ + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau.sym + +GALLIUM_XVMC_LINKER_FLAGS += \ + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc.sym + +GALLIUM_OMX_LINKER_FLAGS += \ + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym +endif + GALLIUM_COMMON_LIB_DEPS = \ -lm \ @@ -93,6 +104,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) \ @@ -115,8 +128,8 @@ GALLIUM_XVMC_LIB_DEPS = \ GALLIUM_OMX_LIB_DEPS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \ - $(GALLIUM_DRI_LIB_DEPS) \ - $(OMX_LIBS) + $(OMX_LIBS) \ + $(GALLIUM_COMMON_LIB_DEPS) GALLIUM_WINSYS_CFLAGS = \ -I$(top_srcdir)/include \