Make unix/ subtree compilable.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/unified_buildsys@3893 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/Makefile.am b/unix/Makefile.am
index 84e47c8..870f221 100644
--- a/unix/Makefile.am
+++ b/unix/Makefile.am
@@ -1,9 +1,7 @@
-SUBDIRS = ../common tx x0vncserver vncviewer vncpasswd po @VNCCONFIG_DIR@
+SUBDIRS = ../common tx x0vncserver vncviewer vncpasswd @VNCCONFIG_DIR@
dist_bin_SCRIPTS = vncserver
man1_MANS = vncserver.man
-ACLOCAL_AMFLAGS = -I m4
-
EXTRA_DIST = vncserver.man
diff --git a/unix/tx/Makefile.am b/unix/tx/Makefile.am
index ec42dbf..5766313 100644
--- a/unix/tx/Makefile.am
+++ b/unix/tx/Makefile.am
@@ -6,4 +6,5 @@
libtx_la_SOURCES = $(HDRS) TXWindow.cxx TXScrollbar.cxx TXViewport.cxx \
TXImage.cxx TXMenu.cxx
-libtx_la_CPPFLAGS = -I$(COMMON_DIR) @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
+libtx_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/common/rfb \
+ @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
diff --git a/unix/vncconfig/Makefile.am b/unix/vncconfig/Makefile.am
index db9f657..fc1c095 100644
--- a/unix/vncconfig/Makefile.am
+++ b/unix/vncconfig/Makefile.am
@@ -7,10 +7,13 @@
vncconfig_SOURCES = $(HDRS) vncExt.c vncconfig.cxx QueryConnectDialog.cxx \
buildtime.c
-vncconfig_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir)/tx @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
+# X_CFLAGS are really CPPFLAGS
+vncconfig_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/unix/tx @X_CFLAGS@
-vncconfig_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \
- $(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
- @X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@
+vncconfig_LDADD = $(top_srcdir)/unix/tx/libtx.la \
+ $(top_srcdir)/common/rfb/librfb.la \
+ $(top_srcdir)/common/network/libnetwork.la \
+ $(top_srcdir)/common/rdr/librdr.la @X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext \
+ @X_EXTRA_LIBS@
EXTRA_DIST = vncconfig.man
diff --git a/unix/vncpasswd/Makefile.am b/unix/vncpasswd/Makefile.am
index c6b9e97..cad2859 100644
--- a/unix/vncpasswd/Makefile.am
+++ b/unix/vncpasswd/Makefile.am
@@ -4,8 +4,9 @@
vncpasswd_SOURCES = vncpasswd.cxx
-vncpasswd_CPPFLAGS = -I$(COMMON_DIR)
+vncpasswd_CPPFLAGS = -I$(top_srcdir)/common
-vncpasswd_LDADD = $(COMMON_DIR)/rfb/librfb.la $(COMMON_DIR)/rdr/librdr.la
+vncpasswd_LDADD = $(top_srcdir)/common/rfb/librfb.la \
+ $(top_srcdir)/common/rdr/librdr.la
EXTRA_DIST = vncpasswd.man
diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am
index 6b81ec3..e5e0190 100644
--- a/unix/vncviewer/Makefile.am
+++ b/unix/vncviewer/Makefile.am
@@ -7,12 +7,15 @@
vncviewer_SOURCES = $(HDRS) DesktopWindow.cxx CConn.cxx vncviewer.cxx \
buildtime.c
+# X_CFLAGS are really CPPFLAGS
+vncviewer_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/unix \
+ -I$(top_srcdir)/unix/tx -I$(top_srcdir)/intl \
+ -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@
-vncviewer_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir) -I$(top_srcdir)/tx \
- -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@ # X_CFLAGS are really CPPFLAGS
-
-vncviewer_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \
- $(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
+vncviewer_LDADD = $(top_srcdir)/unix/tx/libtx.la \
+ $(top_srcdir)/common/rfb/librfb.la \
+ $(top_srcdir)/common/network/libnetwork.la \
+ $(top_srcdir)/common/rdr/librdr.la \
@X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ # @LIBINTL@
EXTRA_DIST = vncviewer.man
diff --git a/unix/x0vncserver/Makefile.am b/unix/x0vncserver/Makefile.am
index f237074..7959304 100644
--- a/unix/x0vncserver/Makefile.am
+++ b/unix/x0vncserver/Makefile.am
@@ -10,13 +10,15 @@
../vncconfig/QueryConnectDialog.cxx buildtime.c
# X_CFLAGS are really CPPFLAGS
-x0vncserver_CPPFLAGS = -I$(COMMON_DIR) -I$(top_srcdir) -I$(top_srcdir)/tx \
- -I$(top_srcdir)/vncconfig @XTEST_DEFINE@ @READDISPLAY_DEFINE@ \
+x0vncserver_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/common/rfb \
+ -I$(top_srcdir)/unix/tx -I$(top_srcdir)/unix/vncconfig \
+ -I$(top_srcdir)/unix @XTEST_DEFINE@ @READDISPLAY_DEFINE@ \
@MITSHM_DEFINE@ @X_CFLAGS@
-x0vncserver_LDADD = $(COMMON_DIR)/rfb/librfb.la \
- $(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
- $(top_srcdir)/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
+x0vncserver_LDADD = $(top_srcdir)/common/rfb/librfb.la \
+ $(top_srcdir)/common/network/libnetwork.la \
+ $(top_srcdir)/common/rdr/librdr.la \
+ $(top_srcdir)/unix/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
@XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@
EXTRA_DIST = x0vncserver.man