diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-04-13 04:27:10 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-04-13 04:27:10 +0000 |
| commit | c9a103cf06517944a745c003c648ef6dd2dce024 (patch) | |
| tree | 59ca2ca9f32e26b64467a2b96d153b03181222e2 /unix/xserver/hw/vnc | |
| parent | ee229f4259df6bc9b046acd43a1e977b822efb93 (diff) | |
| download | tigervnc-c9a103cf06517944a745c003c648ef6dd2dce024.tar.gz tigervnc-c9a103cf06517944a745c003c648ef6dd2dce024.zip | |
Support out-of-tree xorg builds and lay groundwork for cross-compatible build using X.org 7.5
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4018 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver/hw/vnc')
| -rw-r--r-- | unix/xserver/hw/vnc/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index 5845f1ee..5245406e 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -1,5 +1,5 @@ -LIB_DIR=$(top_srcdir)/../../common -BIN_DIR=$(top_srcdir)/.. +TIGERVNC_SRCDIR=${top_srcdir}/../.. +LIB_DIR=${top_builddir}/../../common RFB_LIB=$(LIB_DIR)/rfb/librfb.la RDR_LIB=$(LIB_DIR)/rdr/librdr.la @@ -16,8 +16,8 @@ libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc \ Input.cc libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) -UHAVE_CONFIG_H \ - -I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir) + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ + -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir) bin_PROGRAMS = Xvnc @@ -31,7 +31,7 @@ nodist_Xvnc_SOURCES = fbrop.h fb.h pixman.h Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS -UHAVE_CONFIG_H \ -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \ + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir) Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ @@ -44,7 +44,7 @@ libvnc_ladir = $(moduledir)/extensions libvnc_la_SOURCES = xf86vncModule.cc -libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) -UHAVE_CONFIG_H \ +libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ |