aboutsummaryrefslogtreecommitdiffstats
path: root/unix/xserver
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2011-08-24 16:01:12 +0000
committerDRC <dcommander@users.sourceforge.net>2011-08-24 16:01:12 +0000
commitb08b95ec0978fcee28eb1bd83e255a926ae5c5d6 (patch)
treef725115068d0356116c38b850425ad5f3ee3f14e /unix/xserver
parente1b34760e8b33929b0bee7f3d1ca3f2ed67c0d55 (diff)
downloadtigervnc-b08b95ec0978fcee28eb1bd83e255a926ae5c5d6.tar.gz
tigervnc-b08b95ec0978fcee28eb1bd83e255a926ae5c5d6.zip
Support building an out-of-tree Xvnc binary using in-tree X server sources
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4660 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver')
-rw-r--r--unix/xserver/hw/vnc/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index 8f8c65ba..42da2b40 100644
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -17,7 +17,8 @@ libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc \
libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \
- -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir)
+ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \
+ -I$(top_srcdir)/include
bin_PROGRAMS = Xvnc
@@ -49,6 +50,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_
-I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \
+ -I$(top_srcdir)/include \
${XSERVERLIBS_CFLAGS} -I$(includedir)
libvnc_la_LDFLAGS = -module -avoid-version