[PATCH 2/2] xts5: Make sure libXR5 preceeds the libraries it depends upon in the link order

[Jon TURNEY]

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 xts5/Xlib15/Makefile.am |    2 +-
 xts5/Xlib16/Makefile.am |    8 ++++----
 xts5/Xlib8/Makefile.am  |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xts5/Xlib15/Makefile.am b/xts5/Xlib15/Makefile.am
index a9029ed..b3d42f9 100644
--- a/xts5/Xlib15/Makefile.am
+++ b/xts5/Xlib15/Makefile.am
@@ -17,7 +17,7 @@ nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
-XDefaultString_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la
+XDefaultString_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
 
 tprogs = \
 	XAllocClassHint \
diff --git a/xts5/Xlib16/Makefile.am b/xts5/Xlib16/Makefile.am
index debecac..f2026eb 100644
--- a/xts5/Xlib16/Makefile.am
+++ b/xts5/Xlib16/Makefile.am
@@ -17,10 +17,10 @@ nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
-XrmCombineDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la
-XrmCombineFileDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la
-XrmEnumerateDatabase_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la
-XrmPermStringToQuark_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la
+XrmCombineDatabase_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
+XrmCombineFileDatabase_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
+XrmEnumerateDatabase_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
+XrmPermStringToQuark_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
 
 tprogs = \
 	XrmCombineDatabase \
diff --git a/xts5/Xlib8/Makefile.am b/xts5/Xlib8/Makefile.am
index c505a16..611335a 100644
--- a/xts5/Xlib8/Makefile.am
+++ b/xts5/Xlib8/Makefile.am
@@ -17,7 +17,7 @@ nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
-XFlushGC_LDADD = $(LDADD) $(top_builddir)/xts5/src/libXR5/libXR5.la
+XFlushGC_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
 
 tprogs = \
 	XChangeGC \
-- 
1.6.6.1