diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-10-14 08:54:49 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-10-14 08:54:49 -0700 |
| commit | ed89bffdfde4ce6f70197de14aca36eb296f49c5 (patch) | |
| tree | fff6b03ba09c17fc57c0a28c2a719e59a331fe21 /xts5/Xlib7 | |
| parent | 8237b18702918f254b77ae549a1100229c4ed6be (diff) | |
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.
Diffstat (limited to 'xts5/Xlib7')
| -rw-r--r-- | xts5/Xlib7/Makefile.am | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/xts5/Xlib7/Makefile.am b/xts5/Xlib7/Makefile.am index 583094a6..630450dd 100644 --- a/xts5/Xlib7/Makefile.am +++ b/xts5/Xlib7/Makefile.am @@ -1,9 +1,17 @@ include ../common.mk AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = $(XTS_LCFLAGS) $(XTS_CFLAGS) -LDADD = $(TCM) $(XTS_LLIBS) $(XTS_LIBS) \ - $(top_builddir)/xts5/src/libXR5/libXR5.a +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 \ + $(top_builddir)/xts5/src/libXR5/libXR5.a \ + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) |