diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-03-24 15:19:56 +0000 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-03-24 10:26:44 -0700 |
| commit | 1f9c7db3a60e22b06bd5b5b457ed048f89031b24 (patch) | |
| tree | 11289ffaea7e0810e841139145675d74b5f2897e | |
| parent | 057eab83c13a246b98b29e82922397a86aba4654 (diff) | |
xts5: Make sure libXR5 preceeds the libraries it depends upon in the link order
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
| -rw-r--r-- | xts5/Xlib15/Makefile.am | 2 | ||||
| -rw-r--r-- | xts5/Xlib16/Makefile.am | 8 | ||||
| -rw-r--r-- | 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 a9029edf..b3d42f9a 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 debecacb..f2026eb1 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 c505a166..611335a7 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 \ |