diff options
| -rw-r--r-- | freerdp/Makefile.am | 2 | ||||
| -rw-r--r-- | freerdp1/Makefile.am | 2 | ||||
| -rw-r--r-- | keygen/Makefile.am | 2 | ||||
| -rw-r--r-- | libxrdp/Makefile.am | 2 | ||||
| -rw-r--r-- | mc/Makefile.am | 2 | ||||
| -rw-r--r-- | rdp/Makefile.am | 2 | ||||
| -rw-r--r-- | sesman/Makefile.am | 4 | ||||
| -rw-r--r-- | sesman/chansrv/Makefile.am | 2 | ||||
| -rw-r--r-- | sesman/libscp/Makefile.am | 4 | ||||
| -rw-r--r-- | sesman/sessvc/Makefile.am | 2 | ||||
| -rw-r--r-- | sesman/tools/Makefile.am | 11 | ||||
| -rw-r--r-- | vnc/Makefile.am | 2 | ||||
| -rw-r--r-- | xrdp/Makefile.am | 4 | ||||
| -rw-r--r-- | xup/Makefile.am | 2 |
14 files changed, 21 insertions, 22 deletions
diff --git a/freerdp/Makefile.am b/freerdp/Makefile.am index afb4f85c..21f78741 100644 --- a/freerdp/Makefile.am +++ b/freerdp/Makefile.am @@ -16,5 +16,5 @@ lib_LTLIBRARIES = \ libxrdpfreerdp_la_SOURCES = xrdp-freerdp.c xrdp-color.c libxrdpfreerdp_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la \ + $(top_builddir)/common/libcommon.la \ $(FREERDP_LIBS) diff --git a/freerdp1/Makefile.am b/freerdp1/Makefile.am index cb5e02a9..494e5c04 100644 --- a/freerdp1/Makefile.am +++ b/freerdp1/Makefile.am @@ -16,5 +16,5 @@ lib_LTLIBRARIES = \ libxrdpfreerdp1_la_SOURCES = xrdp-freerdp.c xrdp-color.c libxrdpfreerdp1_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la \ + $(top_builddir)/common/libcommon.la \ $(FREERDP_LIBS) diff --git a/keygen/Makefile.am b/keygen/Makefile.am index 53147317..c28c063d 100644 --- a/keygen/Makefile.am +++ b/keygen/Makefile.am @@ -14,4 +14,4 @@ bin_PROGRAMS = \ xrdp_keygen_SOURCES = keygen.c xrdp_keygen_LDADD = \ - $(top_srcdir)/common/libcommon.la + $(top_builddir)/common/libcommon.la diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am index ad891bd8..11d1d836 100644 --- a/libxrdp/Makefile.am +++ b/libxrdp/Makefile.am @@ -57,5 +57,5 @@ libxrdp_la_LDFLAGS = \ $(EXTRA_FLAGS) libxrdp_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la \ + $(top_builddir)/common/libcommon.la \ $(EXTRA_LIBS) diff --git a/mc/Makefile.am b/mc/Makefile.am index 5d1cb0fa..eb000085 100644 --- a/mc/Makefile.am +++ b/mc/Makefile.am @@ -15,4 +15,4 @@ lib_LTLIBRARIES = \ libmc_la_SOURCES = mc.c libmc_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la + $(top_builddir)/common/libcommon.la diff --git a/rdp/Makefile.am b/rdp/Makefile.am index 4565838d..6f698d29 100644 --- a/rdp/Makefile.am +++ b/rdp/Makefile.am @@ -24,4 +24,4 @@ librdp_la_SOURCES = \ rdp_tcp.c librdp_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la + $(top_builddir)/common/libcommon.la diff --git a/sesman/Makefile.am b/sesman/Makefile.am index 07fdf43a..e4b63eb4 100644 --- a/sesman/Makefile.am +++ b/sesman/Makefile.am @@ -47,8 +47,8 @@ xrdp_sesman_SOURCES = \ $(AUTH_C) xrdp_sesman_LDADD = \ - $(top_srcdir)/common/libcommon.la \ - $(top_srcdir)/sesman/libscp/libscp.la \ + $(top_builddir)/common/libcommon.la \ + $(top_builddir)/sesman/libscp/libscp.la \ $(AUTH_LIB) \ -lpthread diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index fd8c260c..5c6a4d35 100644 --- a/sesman/chansrv/Makefile.am +++ b/sesman/chansrv/Makefile.am @@ -35,6 +35,6 @@ xrdp_chansrv_LDFLAGS = \ xrdp_chansrv_LDADD = \ -L/usr/X11R6/lib \ - $(top_srcdir)/common/libcommon.la \ + $(top_builddir)/common/libcommon.la \ -lX11 -lXfixes \ $(EXTRA_LIBS) diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am index de8513f8..eaf518a8 100644 --- a/sesman/libscp/Makefile.am +++ b/sesman/libscp/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = libscp_connection.h libscp_commands.h libscp.h libscp_session.h libscp_types_mng.h libscp_v1c_mng.h libscp_vX.h libscp_commands_mng.h libscp_init.h libscp_tcp.h libscp_v0.h libscp_v1s.h libscp_lock.h \ -libscp_types.h libscp_v1c.h libscp_v1s_mng.h +libscp_types.h libscp_v1c.h libscp_v1s_mng.h AM_CFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ @@ -27,5 +27,5 @@ libscp_la_SOURCES = \ libscp_vX.c libscp_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la \ + $(top_builddir)/common/libcommon.la \ -lpthread diff --git a/sesman/sessvc/Makefile.am b/sesman/sessvc/Makefile.am index 67740781..8ba24abd 100644 --- a/sesman/sessvc/Makefile.am +++ b/sesman/sessvc/Makefile.am @@ -15,4 +15,4 @@ xrdp_sessvc_SOURCES = \ sessvc.c xrdp_sessvc_LDADD = \ - $(top_srcdir)/common/libcommon.la + $(top_builddir)/common/libcommon.la diff --git a/sesman/tools/Makefile.am b/sesman/tools/Makefile.am index a48b0f11..fdfa8eca 100644 --- a/sesman/tools/Makefile.am +++ b/sesman/tools/Makefile.am @@ -32,13 +32,12 @@ xrdp_dis_SOURCES = \ dis.c xrdp_sesrun_LDADD = \ - $(top_srcdir)/common/libcommon.la + $(top_builddir)/common/libcommon.la xrdp_sestest_LDADD = \ - $(top_srcdir)/common/libcommon.la \ - $(top_srcdir)/sesman/libscp/libscp.la + $(top_builddir)/common/libcommon.la \ + $(top_builddir)/sesman/libscp/libscp.la xrdp_sesadmin_LDADD = \ - $(top_srcdir)/common/libcommon.la \ - $(top_srcdir)/sesman/libscp/libscp.la - + $(top_builddir)/common/libcommon.la \ + $(top_builddir)/sesman/libscp/libscp.la diff --git a/vnc/Makefile.am b/vnc/Makefile.am index 81f44c38..24835011 100644 --- a/vnc/Makefile.am +++ b/vnc/Makefile.am @@ -15,4 +15,4 @@ lib_LTLIBRARIES = \ libvnc_la_SOURCES = vnc.c libvnc_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la + $(top_builddir)/common/libcommon.la diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index 4fe6f6a5..b755bbeb 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -36,8 +36,8 @@ xrdp_SOURCES = \ xrdp_wm.c xrdp_LDADD = \ - $(top_srcdir)/common/libcommon.la \ - $(top_srcdir)/libxrdp/libxrdp.la + $(top_builddir)/common/libcommon.la \ + $(top_builddir)/libxrdp/libxrdp.la xrdpsysconfdir=$(sysconfdir)/xrdp diff --git a/xup/Makefile.am b/xup/Makefile.am index 41d7e3f5..544c957a 100644 --- a/xup/Makefile.am +++ b/xup/Makefile.am @@ -15,4 +15,4 @@ lib_LTLIBRARIES = \ libxup_la_SOURCES = xup.c libxup_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la + $(top_builddir)/common/libcommon.la |