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/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..6dde9b5
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,8 @@
+SUBDIRS = common
+
+if BUILD_WIN
+SUBDIRS += win
+else
+SUBDIRS += unix
+endif
+

diff --git a/configure.ac b/configure.ac
index 1847bc79afd7014838f92fd99c4f544ff4286d37..d395c89b3bc815d13007f28cb6e3025956c08ea9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,12 +31,15 @@ case "`(uname -sr) 2>/dev/null`" in
        ;;
 esac
 
+BUILD_WIN=
 case "$host_os" in
 mingw*)
        CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_IE=0x0500"
        CXXFLAGS="$CXXFLAGS -mthreads"
+       BUILD_WIN=yes
        ;;
 esac
+AM_CONDITIONAL([BUILD_WIN], [test "x$BUILD_WIN" = xyes])
 
 dnl FIXME: Check for MIT-SHM properly, add a corresponding --with option.
 if test "$USE_MITSHM" = yes; then

diff --git a/unix/Makefile.am b/unix/Makefile.am
index 84e47c89074a2e00a304cb32d8576cc316df8299..870f221d1cb2dee62c333bca84098ac2febd9f1b 100644 (file)
--- 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 ec42dbf4f1c46e48b1b3d60b43482243f7470b15..576631390cd7ec43509d6aefad806f843e5de399 100644 (file)
--- a/unix/tx/Makefile.am
+++ b/unix/tx/Makefile.am
@@ -6,4 +6,5 @@ HDRS = TXButton.h TXCheckbox.h TXDialog.h TXEntry.h TXImage.h TXLabel.h \
 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 db9f6571e1cd8e3041308359d6ce771f301804e4..fc1c0955fd222a542fe29e0f290e47e8e4e04078 100644 (file)
--- a/unix/vncconfig/Makefile.am
+++ b/unix/vncconfig/Makefile.am
@@ -7,10 +7,13 @@ HDRS = QueryConnectDialog.h vncExt.h
 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 c6b9e974f9943e3bb7f1da7029d2a342a318d60f..cad28596eb988c45d3a2a02d18d3eb4279188174 100644 (file)
--- a/unix/vncpasswd/Makefile.am
+++ b/unix/vncpasswd/Makefile.am
@@ -4,8 +4,9 @@ man1_MANS = vncpasswd.man
 
 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 6b81ec37a2fb1f5cdf4bb865a7072056e46a356b..e5e0190999230a445db783bd0e12ad96a12ca305 100644 (file)
--- a/unix/vncviewer/Makefile.am
+++ b/unix/vncviewer/Makefile.am
@@ -7,12 +7,15 @@ HDRS = AboutDialog.h CConn.h DesktopWindow.h gettext.h InfoDialog.h \
 
 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 f2370748a5a3501bb6fdad4b2ec1d2055a55c124..79593040ccc622035f3ee5b73767dc1a7a7886c4 100644 (file)
--- a/unix/x0vncserver/Makefile.am
+++ b/unix/x0vncserver/Makefile.am
@@ -10,13 +10,15 @@ x0vncserver_SOURCES = $(HDRS) Image.cxx TimeMillis.cxx PollingScheduler.cxx \
        ../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