From dc047a36f60cb74892dfbbd627dc7a3d41184687 Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Tue, 14 Sep 2010 10:41:50 -0700 Subject: Include libxts5.la in Xproto and XIproto's LDADD lines Normally, the linker picks up libxts5.so from libxts5proto.so's RPATH. However, apparently cross-compilers don't do that, and the linker complains about not being able to find it. To work around that, specify it manually on the libtool command line. Signed-off-by: Aaron Plattner Reviewed-by: Adam Cheney --- xts5/XIproto/Makefile.am | 1 + xts5/Xproto/Makefile.am | 1 + 2 files changed, 2 insertions(+) diff --git a/xts5/XIproto/Makefile.am b/xts5/XIproto/Makefile.am index b8248fd0..483537c5 100644 --- a/xts5/XIproto/Makefile.am +++ b/xts5/XIproto/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ $(top_builddir)/xts5/src/libxts5proto.la \ + $(top_builddir)/xts5/src/libxts5.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(top_builddir)/src/tet3/apilib/libapi_s.la \ $(XTS_LIBS) diff --git a/xts5/Xproto/Makefile.am b/xts5/Xproto/Makefile.am index 1ac0f28c..c0ba4b91 100644 --- a/xts5/Xproto/Makefile.am +++ b/xts5/Xproto/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \ $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ $(top_builddir)/xts5/src/libxts5proto.la \ + $(top_builddir)/xts5/src/libxts5.la \ $(top_builddir)/src/tet3/apilib/libapi.la \ $(top_builddir)/src/tet3/apilib/libapi_s.la \ $(XTS_LIBS) -- cgit v1.2.3