Merged the x0vncserver directory with VNC 4.1.1.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/merge-with-vnc-4.1.1@529 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/x0vncserver/Makefile.in b/x0vncserver/Makefile.in
index b6bd0ba..3657eea 100644
--- a/x0vncserver/Makefile.in
+++ b/x0vncserver/Makefile.in
@@ -1,18 +1,21 @@
SRCS = Image.cxx TimeMillis.cxx PollingScheduler.cxx PollingManager.cxx \
- x0vncserver.cxx
+ x0vncserver.cxx ../vncconfig/QueryConnectDialog.cxx
OBJS = $(SRCS:.cxx=.o)
program = x0vncserver
-DEP_LIBS = ../rfb/librfb.a ../network/libnetwork.a ../rdr/librdr.a
+DEP_LIBS = ../rfb/librfb.a \
+ ../network/libnetwork.a \
+ ../rdr/librdr.a \
+ ../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) \
+DIR_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tx -I$(top_srcdir)/vncconfig \
@XTEST_DEFINE@ @READDISPLAY_DEFINE@ @MITSHM_DEFINE@ @X_CFLAGS@
all:: $(program)