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 c933f4dcc6fff19b9bb3e691a3f078e93c4ccf49..b7660a58e90c55433615e4af55559e2ed795fc20 100644 (file)
--- 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 1c8132d906eb26425a61a15ff796cdf986ec0498..d2607599b4d7ba4a469906a1de58a0a515db15fc 100644 (file)
--- 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 1223c5765dc6626cf70162cfbdc68fb9ed72be3c..57db67166cbe7d90269e8030d8172dbdbee7d2fc 100644 (file)
--- 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 f279649c999e944734b669ce9674748bf0b4557e..d2d34ed0b2ed78b33646ded8fe303ed3ee077e82 100644 (file)
--- 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