From a62b5759a2d9352ce6c972c35027071ec5c9bf41 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Thu, 31 Oct 2024 12:50:04 +0100 Subject: [PATCH] Fudge library path to work around dependency loops --- unix/xserver/hw/vnc/Makefile.am | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index caf3b948..4049bafa 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -1,11 +1,14 @@ TIGERVNC_SRCDIR=${top_srcdir}/../.. TIGERVNC_BUILDDIR=${TIGERVNC_SRCDIR} -RFB_LIB=$(TIGERVNC_BUILDDIR)/common/rfb/librfb.la -RDR_LIB=$(TIGERVNC_BUILDDIR)/common/rdr/librdr.la -OS_LIB=$(TIGERVNC_BUILDDIR)/common/os/libos.la -NETWORK_LIB=$(TIGERVNC_BUILDDIR)/common/network/libnetwork.la -UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)/unix/common/libunixcommon.la +# FIXME: We add an extra / to the paths to trick libtool in to adding +# the libraries twice, to work around the dependency cycles we +# have +RFB_LIB=$(TIGERVNC_BUILDDIR)//common/rfb/librfb.la +RDR_LIB=$(TIGERVNC_BUILDDIR)//common/rdr/librdr.la +OS_LIB=$(TIGERVNC_BUILDDIR)//common/os/libos.la +NETWORK_LIB=$(TIGERVNC_BUILDDIR)//common/network/libnetwork.la +UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)//unix/common/libunixcommon.la COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(OS_LIB) $(UNIXCOMMON_LIB) AM_CPPFLAGS = \ -- 2.39.5