diff options
| author | Pierre Ossman <ossman@cendio.se> | 2018-04-13 13:39:16 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2018-04-13 13:39:16 +0200 |
| commit | db78f2a70f3c7e6aa15a9c8b42b07a46ca69598b (patch) | |
| tree | bc0128f757aa0fbaa2c521b267fdc540bb8dd801 /unix/xserver/hw | |
| parent | 382d3735f0b32792a2cc17be3bb9845dab953ab7 (diff) | |
| download | tigervnc-db78f2a70f3c7e6aa15a9c8b42b07a46ca69598b.tar.gz tigervnc-db78f2a70f3c7e6aa15a9c8b42b07a46ca69598b.zip | |
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.
Diffstat (limited to 'unix/xserver/hw')
| -rw-r--r-- | unix/xserver/hw/vnc/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
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 |