From 8f1d336c416b4dbf7f82ee921fc7b12ab0075896 Mon Sep 17 00:00:00 2001 From: Constantin Kaplinsky Date: Fri, 2 Jun 2006 04:31:15 +0000 Subject: [PATCH] Fixed paths in makefiles under unix/xc/ to reflect changes in directory layout. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@619 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- unix/xc/config/cf/vnc.def | 12 +++++++----- unix/xc/programs/Xserver/vnc/Imakefile | 5 +++-- unix/xc/programs/Xserver/vnc/Xvnc/Imakefile | 4 ++-- unix/xc/programs/Xserver/vnc/module/Imakefile | 5 +++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/unix/xc/config/cf/vnc.def b/unix/xc/config/cf/vnc.def index c933f4dc..b7660a58 100644 --- a/unix/xc/config/cf/vnc.def +++ b/unix/xc/config/cf/vnc.def @@ -23,11 +23,13 @@ #define SiteExtensionDefines VNCExtDefines #define SiteExtensionDirs vnc -#define VncExtLibs $(TOP)/../rfb/librfb.a \ - $(TOP)/../Xregion/libXregion.a \ - $(TOP)/../network/libnetwork.a \ - $(TOP)/../rdr/librdr.a \ - $(TOP)/../jpeg/build/libjpeg.a +#define VncUnixDir $(TOP)/.. +#define VncCommonDir VncUnixDir/../common +#define VncExtLibs VncCommonDir/rfb/librfb.a \ + VncCommonDir/Xregion/libXregion.a \ + VncCommonDir/network/libnetwork.a \ + VncCommonDir/rdr/librdr.a \ + VncCommonDir/jpeg/build/libjpeg.a #define SiteExtensionLibs vnc/LibraryTargetName(vnc) VncExtLibs diff --git a/unix/xc/programs/Xserver/vnc/Imakefile b/unix/xc/programs/Xserver/vnc/Imakefile index 1c8132d9..d2607599 100644 --- a/unix/xc/programs/Xserver/vnc/Imakefile +++ b/unix/xc/programs/Xserver/vnc/Imakefile @@ -1,8 +1,9 @@ XCOMM CDEBUGFLAGS = -g XCOMM CXXDEBUGFLAGS = -g - VNCTOP = $(TOP)/.. - VNCINCLUDE = -I$(VNCTOP) -I$(VNCTOP)/vncconfig_unix + VNCUNIXDIR = VncUnixDir + VNCCOMMONDIR = VncCommonDir + VNCINCLUDE = -I$(VNCCOMMONDIR) -I$(VNCUNIXDIR)/vncconfig #define CplusplusSource diff --git a/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile b/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile index 1223c576..57db6716 100644 --- a/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile +++ b/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile @@ -1,7 +1,7 @@ - VNCTOP = $(TOP)/.. + VNCCOMMONDIR = VncCommonDir + VNCINCLUDE = -I$(VNCCOMMONDIR) VNCLIBS = VncExtLibs - VNCINCLUDE = -I$(VNCTOP) -I$(VNCTOP)/vncconfig_unix #if defined(XFree86Version) && XFree86Version < 4000 VNCDEFINES = -DNO_INIT_BACKING_STORE diff --git a/unix/xc/programs/Xserver/vnc/module/Imakefile b/unix/xc/programs/Xserver/vnc/module/Imakefile index f279649c..d2d34ed0 100644 --- a/unix/xc/programs/Xserver/vnc/module/Imakefile +++ b/unix/xc/programs/Xserver/vnc/module/Imakefile @@ -1,7 +1,8 @@ - VNCTOP = $(TOP)/.. + VNCUNIXDIR = VncUnixDir + VNCCOMMONDIR = VncCommonDir VNCLIBS = VncExtLibs - VNCINCLUDE = -I$(VNCTOP) -I$(VNCTOP)/vncconfig_unix + VNCINCLUDE = -I$(VNCCOMMONDIR) -I$(VNCUNIXDIR)/vncconfig #define CplusplusSource -- 2.39.5