diff options
| author | Phil Blundell <pb@reciva.com> | 2004-07-21 20:33:35 +0000 |
|---|---|---|
| committer | Phil Blundell <pb@reciva.com> | 2004-07-21 20:33:35 +0000 |
| commit | 448e0754e369d433a61ae337bbfd7dba195c5e69 (patch) | |
| tree | 3b9fdc0e3537cb37f80b230c137412cf30fb66d5 | |
| parent | 0c32a94623b13dd1ac5b015b465bdf890f498282 (diff) | |
Include -lts if appropriate. Patch from pattieja@bentham.ispvip.biz.
| -rw-r--r-- | hw/kdrive/neomagic/ChangeLog | 5 | ||||
| -rw-r--r-- | hw/kdrive/neomagic/Makefile.am | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/hw/kdrive/neomagic/ChangeLog b/hw/kdrive/neomagic/ChangeLog index 8ea6bf91f..2889d90f3 100644 --- a/hw/kdrive/neomagic/ChangeLog +++ b/hw/kdrive/neomagic/ChangeLog @@ -1,3 +1,8 @@ +2004-07-21 Phil Blundell <pb@nexus.co.uk> + + * Makefile.am (Xneomagic_LDADD): Include -lts if appropriate. + Patch from pattieja@bentham.ispvip.biz. + 2004-06-07 Franco Catrin L. <fcatrin@tuxpan.com> * Small fix for depth calculation diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am index 1ed4aae99..58f80c230 100644 --- a/hw/kdrive/neomagic/Makefile.am +++ b/hw/kdrive/neomagic/Makefile.am @@ -16,6 +16,10 @@ INCLUDES = \ bin_PROGRAMS = Xneomagic +if TSLIB +TSLIB_FLAG = -lts +endif + noinst_LIBRARIES = libneomagic.a libneomagic_a_SOURCES = \ @@ -37,6 +41,7 @@ NEOMAGIC_LIBS = \ Xneomagic_LDADD = \ $(NEOMAGIC_LIBS) \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ + @XSERVER_LIBS@ \ + $(TSLIB_FLAG) Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@ |