Fix VPATH and out-of-tree builds when using MinGW
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4054 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/win/vncconfig/Makefile.am b/win/vncconfig/Makefile.am
index 82cb7da..84d1b0f 100644
--- a/win/vncconfig/Makefile.am
+++ b/win/vncconfig/Makefile.am
@@ -7,11 +7,11 @@
vncconfig_CPPFLAGS = -I$(top_srcdir)/win -I$(top_srcdir)/common
-vncconfig_LDADD = $(top_srcdir)/win/rfb_win32/librfb_win32.la \
- $(top_srcdir)/common/rfb/librfb.la \
- $(top_srcdir)/common/Xregion/libXregion.la \
- $(top_srcdir)/common/network/libnetwork.la \
- $(top_srcdir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \
+vncconfig_LDADD = $(top_builddir)/win/rfb_win32/librfb_win32.la \
+ $(top_builddir)/common/rfb/librfb.la \
+ $(top_builddir)/common/Xregion/libXregion.la \
+ $(top_builddir)/common/network/libnetwork.la \
+ $(top_builddir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \
-lcomctl32 resources.o
EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest
diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am
index d58df37..db398ae 100644
--- a/win/vncviewer/Makefile.am
+++ b/win/vncviewer/Makefile.am
@@ -32,11 +32,11 @@
vncviewer_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
-vncviewer_LDADD = $(top_srcdir)/common/rfb/librfb.la \
- $(top_srcdir)/win/rfb_win32/librfb_win32.la \
- $(top_srcdir)/common/Xregion/libXregion.la \
- $(top_srcdir)/common/network/libnetwork.la \
- $(top_srcdir)/common/rdr/librdr.la \
+vncviewer_LDADD = $(top_builddir)/common/rfb/librfb.la \
+ $(top_builddir)/win/rfb_win32/librfb_win32.la \
+ $(top_builddir)/common/Xregion/libXregion.la \
+ $(top_builddir)/common/network/libnetwork.la \
+ $(top_builddir)/common/rdr/librdr.la \
resources.o -lws2_32 -lgdi32 -luser32 -lcomctl32 -lversion -lcomdlg32
vncviewer_LDFLAGS = -I$(top_srcdir)/win -mwindows
diff --git a/win/winvnc/Makefile.am b/win/winvnc/Makefile.am
index da555fe..19f3ada 100644
--- a/win/winvnc/Makefile.am
+++ b/win/winvnc/Makefile.am
@@ -10,11 +10,11 @@
winvnc4_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
-winvnc4_LDADD = $(top_srcdir)/common/rfb/librfb.la \
- $(top_srcdir)/win/rfb_win32/librfb_win32.la \
- $(top_srcdir)/common/Xregion/libXregion.la \
- $(top_srcdir)/common/network/libnetwork.la \
- $(top_srcdir)/common/rdr/librdr.la resources.o -lws2_32 -lgdi32 \
+winvnc4_LDADD = $(top_builddir)/common/rfb/librfb.la \
+ $(top_builddir)/win/rfb_win32/librfb_win32.la \
+ $(top_builddir)/common/Xregion/libXregion.la \
+ $(top_builddir)/common/network/libnetwork.la \
+ $(top_builddir)/common/rdr/librdr.la resources.o -lws2_32 -lgdi32 \
-lole32 -lcomctl32 -lversion
winvnc4_LDFLAGS = -mwindows