Skip to content

Commit

Permalink
Revert Xvnc double slash hack
Browse files Browse the repository at this point in the history
We should hopefully no longer require the common libraries to be linked
twice anymore for things to work.
  • Loading branch information
CendioOssman committed Dec 4, 2024
1 parent 8f8b929 commit b0e13b4
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions unix/xserver/hw/vnc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
TIGERVNC_SRCDIR=${top_srcdir}/../..
TIGERVNC_BUILDDIR=${TIGERVNC_SRCDIR}

# 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
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=$(UNIXCOMMON_LIB) $(RFB_LIB) $(NETWORK_LIB) $(RDR_LIB) $(CORE_LIB)

AM_CPPFLAGS = \
Expand Down

0 comments on commit b0e13b4

Please sign in to comment.