autotools: change top_srcdir to top_builddir for LIBADD

This commit is contained in:
Jay Sorg 2012-07-13 16:18:02 -07:00
parent 5356242c47
commit 58f5dcc030
14 changed files with 21 additions and 22 deletions

View File

@ -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)

View File

@ -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)

View File

@ -14,4 +14,4 @@ bin_PROGRAMS = \
xrdp_keygen_SOURCES = keygen.c
xrdp_keygen_LDADD = \
$(top_srcdir)/common/libcommon.la
$(top_builddir)/common/libcommon.la

View File

@ -57,5 +57,5 @@ libxrdp_la_LDFLAGS = \
$(EXTRA_FLAGS)
libxrdp_la_LIBADD = \
$(top_srcdir)/common/libcommon.la \
$(top_builddir)/common/libcommon.la \
$(EXTRA_LIBS)

View File

@ -15,4 +15,4 @@ lib_LTLIBRARIES = \
libmc_la_SOURCES = mc.c
libmc_la_LIBADD = \
$(top_srcdir)/common/libcommon.la
$(top_builddir)/common/libcommon.la

View File

@ -24,4 +24,4 @@ librdp_la_SOURCES = \
rdp_tcp.c
librdp_la_LIBADD = \
$(top_srcdir)/common/libcommon.la
$(top_builddir)/common/libcommon.la

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -15,4 +15,4 @@ xrdp_sessvc_SOURCES = \
sessvc.c
xrdp_sessvc_LDADD = \
$(top_srcdir)/common/libcommon.la
$(top_builddir)/common/libcommon.la

View File

@ -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

View File

@ -15,4 +15,4 @@ lib_LTLIBRARIES = \
libvnc_la_SOURCES = vnc.c
libvnc_la_LIBADD = \
$(top_srcdir)/common/libcommon.la
$(top_builddir)/common/libcommon.la

View File

@ -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

View File

@ -15,4 +15,4 @@ lib_LTLIBRARIES = \
libxup_la_SOURCES = xup.c
libxup_la_LIBADD = \
$(top_srcdir)/common/libcommon.la
$(top_builddir)/common/libcommon.la