From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 13 Apr 2018 11:39:16 +0000 (+0200)
Subject: Improve out-of-tree build of Xvnc/libvnc.so
X-Git-Tag: v1.8.90~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=db78f2a70f3c7e6aa15a9c8b42b07a46ca69598b;p=tigervnc.git

Improve out-of-tree build of Xvnc/libvnc.so

With the new unixcommon library we have things outside of common/,
so make the handling of out-of-tree builds more general.
---

diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index e8fa38e8..470424b5 100644
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -1,12 +1,12 @@
 TIGERVNC_SRCDIR=${top_srcdir}/../..
-LIB_DIR=${top_builddir}/../../common
-
-RFB_LIB=$(LIB_DIR)/rfb/librfb.la
-RDR_LIB=$(LIB_DIR)/rdr/librdr.la
-OS_LIB=$(LIB_DIR)/os/libos.la
-NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
-XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
-UNIXCOMMON_LIB=${top_builddir}/../common/libunixcommon.la
+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
+XREGION_LIB=$(TIGERVNC_BUILDDIR)/common/Xregion/libXregion.la
+UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)/unix/common/libunixcommon.la
 COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) $(OS_LIB) $(UNIXCOMMON_LIB)
 
 noinst_LTLIBRARIES = libvnccommon.la