diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-02-14 02:11:04 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-02-14 02:11:04 +0000 |
| commit | 09e2ff130e9cd027aa46f38fb110cb2f10da0d11 (patch) | |
| tree | d179b7fb4d49bc5162762e1925063019b0afe9ca /unix | |
| parent | e338bf8f35a37baf9d077734141c7729534378ea (diff) | |
| download | tigervnc-09e2ff130e9cd027aa46f38fb110cb2f10da0d11.tar.gz tigervnc-09e2ff130e9cd027aa46f38fb110cb2f10da0d11.zip | |
Fix VPATH and out-of-tree builds
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3984 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/vncconfig/Makefile.am | 8 | ||||
| -rw-r--r-- | unix/vncpasswd/Makefile.am | 4 | ||||
| -rw-r--r-- | unix/vncviewer/Makefile.am | 8 | ||||
| -rw-r--r-- | unix/x0vncserver/Makefile.am | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/unix/vncconfig/Makefile.am b/unix/vncconfig/Makefile.am index fc1c0955..eae1b448 100644 --- a/unix/vncconfig/Makefile.am +++ b/unix/vncconfig/Makefile.am @@ -10,10 +10,10 @@ vncconfig_SOURCES = $(HDRS) vncExt.c vncconfig.cxx QueryConnectDialog.cxx \ # X_CFLAGS are really CPPFLAGS vncconfig_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/unix/tx @X_CFLAGS@ -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 \ +vncconfig_LDADD = $(top_builddir)/unix/tx/libtx.la \ + $(top_builddir)/common/rfb/librfb.la \ + $(top_builddir)/common/network/libnetwork.la \ + $(top_builddir)/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 cad28596..00951be3 100644 --- a/unix/vncpasswd/Makefile.am +++ b/unix/vncpasswd/Makefile.am @@ -6,7 +6,7 @@ vncpasswd_SOURCES = vncpasswd.cxx vncpasswd_CPPFLAGS = -I$(top_srcdir)/common -vncpasswd_LDADD = $(top_srcdir)/common/rfb/librfb.la \ - $(top_srcdir)/common/rdr/librdr.la +vncpasswd_LDADD = $(top_builddir)/common/rfb/librfb.la \ + $(top_builddir)/common/rdr/librdr.la EXTRA_DIST = vncpasswd.man diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am index e5e01909..9690015e 100644 --- a/unix/vncviewer/Makefile.am +++ b/unix/vncviewer/Makefile.am @@ -12,10 +12,10 @@ vncviewer_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/unix \ -I$(top_srcdir)/unix/tx -I$(top_srcdir)/intl \ -DLOCALEDIR=\"$(localedir)\" @X_CFLAGS@ -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 \ +vncviewer_LDADD = $(top_builddir)/unix/tx/libtx.la \ + $(top_builddir)/common/rfb/librfb.la \ + $(top_builddir)/common/network/libnetwork.la \ + $(top_builddir)/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 79593040..c947257e 100644 --- a/unix/x0vncserver/Makefile.am +++ b/unix/x0vncserver/Makefile.am @@ -15,10 +15,10 @@ x0vncserver_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/common/rfb \ -I$(top_srcdir)/unix @XTEST_DEFINE@ @READDISPLAY_DEFINE@ \ @MITSHM_DEFINE@ @X_CFLAGS@ -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@ \ +x0vncserver_LDADD = $(top_builddir)/common/rfb/librfb.la \ + $(top_builddir)/common/network/libnetwork.la \ + $(top_builddir)/common/rdr/librdr.la \ + $(top_builddir)/unix/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \ @XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@ EXTRA_DIST = x0vncserver.man |