Fudge library path to work around dependency loops

TigerVNC · Oct 31, 2024 · a62b575 · a62b575
1 parent 9f51fcf
commit a62b575
Showing 1 changed file with 8 additions and 5 deletions.
diff --git 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 = \