summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2010-09-14 10:41:50 -0700
committerAaron Plattner <aplattner@nvidia.com>2010-09-15 15:29:50 -0700
commitdc047a36f60cb74892dfbbd627dc7a3d41184687 (patch)
tree9e729bd7c0d22cc53a513179800003fd8fdf197a
parent9fa6bdc8c4af3f8ad6835bd24802f0268f531c5b (diff)
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 <aplattner@nvidia.com> Reviewed-by: Adam Cheney <acheney@nvidia.com>
-rw-r--r--xts5/XIproto/Makefile.am1
-rw-r--r--xts5/Xproto/Makefile.am1
2 files changed, 2 insertions, 0 deletions
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)