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
diff --git a/unix/xc/config/cf/vnc.def b/unix/xc/config/cf/vnc.def
index c933f4d..b7660a5 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 1c8132d..d260759 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 1223c57..57db671 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 f279649..d2d34ed 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