Updated build scripts in unix/ for new directory layout.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@617 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/x0vncserver/Makefile.in b/unix/x0vncserver/Makefile.in
index cbb9fed..39e6685 100644
--- a/unix/x0vncserver/Makefile.in
+++ b/unix/x0vncserver/Makefile.in
@@ -1,22 +1,22 @@
SRCS = Image.cxx TimeMillis.cxx PollingScheduler.cxx PollingManager.cxx \
Geometry.cxx \
- x0vncserver.cxx ../vncconfig_unix/QueryConnectDialog.cxx
+ x0vncserver.cxx ../vncconfig/QueryConnectDialog.cxx
OBJS = $(SRCS:.cxx=.o)
program = x0vncserver
-DEP_LIBS = ../rfb/librfb.a \
- ../network/libnetwork.a \
- ../rdr/librdr.a \
- ../tx/libtx.a
+DEP_LIBS = $(COMMON)/rfb/librfb.a \
+ $(COMMON)/network/libnetwork.a \
+ $(COMMON)/rdr/librdr.a \
+ $(TOP)/tx/libtx.a
EXTRA_LIBS = @ZLIB_LIB@ @JPEG_LIB@ @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
@XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@
# X_CFLAGS are really CPPFLAGS
-DIR_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tx -I$(top_srcdir)/vncconfig_unix \
+DIR_CPPFLAGS = -I$(COMMON) -I$(TOP) -I$(TOP)/tx -I$(TOP)/vncconfig \
@XTEST_DEFINE@ @READDISPLAY_DEFINE@ @MITSHM_DEFINE@ @X_CFLAGS@
all:: $(program)
diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index 80483bf..96240ea 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -34,7 +34,7 @@
#include <network/TcpSocket.h>
#include <tx/TXWindow.h>
-#include <vncconfig_unix/QueryConnectDialog.h>
+#include <vncconfig/QueryConnectDialog.h>
#include <signal.h>
#include <X11/X.h>