diff options
| -rw-r--r-- | common/Makefile.am | 17 | ||||
| -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 | 7 | ||||
| -rw-r--r-- | sesman/libscp/Makefile.am | 3 | ||||
| -rw-r--r-- | vnc/Makefile.am | 2 | ||||
| -rw-r--r-- | xup/Makefile.am | 2 |
8 files changed, 20 insertions, 17 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index bdecbda4..0d0e6495 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,11 +1,7 @@ +lib_LTLIBRARIES = \ + libxrdp-common.la -INCLUDES = \ - -fPIC - -noinst_LIBRARIES = \ - libxrdp-common.a - -libxrdp_common_a_SOURCES = \ +libxrdp_common_la_SOURCES = \ d3des.c \ file.c \ list.c \ @@ -13,3 +9,10 @@ libxrdp_common_a_SOURCES = \ os_calls.c \ ssl_calls.c \ thread_calls.c + +libxrdp_common_la_LIBADD = \ + -lcrypto \ + -lpthread + +libxrdp_common_la_LDFLAGS = \ + -version-info 5:0:5 diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am index 96ec7cd2..ed336405 100644 --- a/libxrdp/Makefile.am +++ b/libxrdp/Makefile.am @@ -18,7 +18,7 @@ libxrdp_la_SOURCES = \ xrdp_bitmap_compress.c libxrdp_la_LIBADD = \ - $(top_srcdir)/common/libxrdp-common.a + $(top_srcdir)/common/libxrdp-common.la libxrdp_la_LDFLAGS = \ -version-info 5:0:5 diff --git a/mc/Makefile.am b/mc/Makefile.am index 7f5c23a7..7fb551d9 100644 --- a/mc/Makefile.am +++ b/mc/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = \ libmc_la_SOURCES = mc.c libmc_la_LIBADD = \ - $(top_srcdir)/common/libxrdp-common.a + $(top_srcdir)/common/libxrdp-common.la libmc_la_LDFLAGS = \ -version-info 5:0:5 diff --git a/rdp/Makefile.am b/rdp/Makefile.am index f149a931..7d7e8758 100644 --- a/rdp/Makefile.am +++ b/rdp/Makefile.am @@ -16,7 +16,7 @@ librdp_la_SOURCES = \ rdp_tcp.c librdp_la_LIBADD = \ - $(top_srcdir)/common/libxrdp-common.a + $(top_srcdir)/common/libxrdp-common.la librdp_la_LDFLAGS = \ -version-info 5:0:5 diff --git a/sesman/Makefile.am b/sesman/Makefile.am index 98f34e79..0f22f9bc 100644 --- a/sesman/Makefile.am +++ b/sesman/Makefile.am @@ -24,14 +24,11 @@ xrdp_sessvc_SOURCES = \ sessvc.c xrdp_sesman_LDADD = \ - $(top_srcdir)/common/libxrdp-common.a \ + $(top_srcdir)/common/libxrdp-common.la \ $(top_srcdir)/sesman/libscp/libscp.la \ - -ldl \ - -lpthread \ -lpam xrdp_sessvc_LDADD = \ - $(top_srcdir)/common/libxrdp-common.a \ - -ldl + $(top_srcdir)/common/libxrdp-common.la SUBDIRS = libscp diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am index e5d22116..f148b6ae 100644 --- a/sesman/libscp/Makefile.am +++ b/sesman/libscp/Makefile.am @@ -15,5 +15,8 @@ libscp_la_SOURCES = \ libscp_v1s.c \ libscp_vX.c +libscp_la_LIBADD = \ + $(top_srcdir)/common/libxrdp-common.la + libscp_la_LDFLAGS = \ -version-info 5:0:5 diff --git a/vnc/Makefile.am b/vnc/Makefile.am index 790a9ba8..7933a470 100644 --- a/vnc/Makefile.am +++ b/vnc/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = \ libvnc_la_SOURCES = vnc.c libvnc_la_LIBADD = \ - $(top_srcdir)/common/libxrdp-common.a + $(top_srcdir)/common/libxrdp-common.la libvnc_la_LDFLAGS = \ -version-info 5:0:5 diff --git a/xup/Makefile.am b/xup/Makefile.am index 13652c53..9f669eee 100644 --- a/xup/Makefile.am +++ b/xup/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = \ libxup_la_SOURCES = xup.c libxup_la_LIBADD = \ - $(top_srcdir)/common/libxrdp-common.a + $(top_srcdir)/common/libxrdp-common.la libxup_la_LDFLAGS = \ -version-info 5:0:5 |