Skip to content

Commit a62b575

Browse files
committed
Fudge library path to work around dependency loops
1 parent 9f51fcf commit a62b575

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

unix/xserver/hw/vnc/Makefile.am

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
TIGERVNC_SRCDIR=${top_srcdir}/../..
22
TIGERVNC_BUILDDIR=${TIGERVNC_SRCDIR}
33

4-
RFB_LIB=$(TIGERVNC_BUILDDIR)/common/rfb/librfb.la
5-
RDR_LIB=$(TIGERVNC_BUILDDIR)/common/rdr/librdr.la
6-
OS_LIB=$(TIGERVNC_BUILDDIR)/common/os/libos.la
7-
NETWORK_LIB=$(TIGERVNC_BUILDDIR)/common/network/libnetwork.la
8-
UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)/unix/common/libunixcommon.la
4+
# FIXME: We add an extra / to the paths to trick libtool in to adding
5+
# the libraries twice, to work around the dependency cycles we
6+
# have
7+
RFB_LIB=$(TIGERVNC_BUILDDIR)//common/rfb/librfb.la
8+
RDR_LIB=$(TIGERVNC_BUILDDIR)//common/rdr/librdr.la
9+
OS_LIB=$(TIGERVNC_BUILDDIR)//common/os/libos.la
10+
NETWORK_LIB=$(TIGERVNC_BUILDDIR)//common/network/libnetwork.la
11+
UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)//unix/common/libunixcommon.la
912
COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(OS_LIB) $(UNIXCOMMON_LIB)
1013

1114
AM_CPPFLAGS = \

0 commit comments

Comments
 (0)