From ed89bffdfde4ce6f70197de14aca36eb296f49c5 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed, 14 Oct 2009 08:54:49 -0700
Subject: xts5: Stop gratuitous use of make variables in common.mk

The meanings of the variables were confusing or obfuscating. Now it's
much clearer which libraries are in use.
---
 xts5/XI/Makefile.am | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'xts5/XI')

diff --git a/xts5/XI/Makefile.am b/xts5/XI/Makefile.am
index e05d6bc9..e5d219d0 100644
--- a/xts5/XI/Makefile.am
+++ b/xts5/XI/Makefile.am
@@ -1,8 +1,16 @@
 include ../common.mk
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS)
-LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS)
+AM_CFLAGS = -I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/tet3/inc \
+	-I$(top_srcdir)/xts5/include \
+	$(XTS_CFLAGS)
+LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
+	$(top_builddir)/xts5/src/xim/libximtest.a \
+	$(top_builddir)/xts5/src/lib/libxtest.a \
+	$(top_builddir)/xts5/fonts/libfont.a \
+	$(top_builddir)/src/tet3/apilib/libapi.la \
+	$(XTS_LIBS)
 
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
-- 
cgit v1.2.3