Fix PSPP link on OpenSUSE and possibly Ubuntu 11.10.

[pspp-builds.git] / src / ui / terminal / automake.mk

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 5ab098577a57f015040543faf7387960ab46a8cd..7bf2e6fc36dc30b3ddc3e71f4761c0a820072048 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -3,18 +3,15 @@
 noinst_LTLIBRARIES += src/ui/terminal/libui.la
 
 src_ui_terminal_libui_la_SOURCES = \
-       src/ui/terminal/read-line.c \
-       src/ui/terminal/read-line.h \
        src/ui/terminal/main.c \
-       src/ui/terminal/msg-ui.c \
-       src/ui/terminal/msg-ui.h \
-       src/ui/terminal/terminal.c \
-       src/ui/terminal/terminal.h \
        src/ui/terminal/terminal-opts.c \
-       src/ui/terminal/terminal-opts.h 
-
+       src/ui/terminal/terminal-opts.h \
+       src/ui/terminal/terminal-reader.c \
+       src/ui/terminal/terminal-reader.h \
+       src/ui/terminal/terminal.c \
+       src/ui/terminal/terminal.h
 
-src_ui_terminal_libui_la_CFLAGS = -DINSTALLDIR=\"$(bindir)\" $(NCURSES_CFLAGS)
+src_ui_terminal_libui_la_CFLAGS = $(NCURSES_CFLAGS)
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
@@ -25,9 +22,10 @@ src_ui_terminal_pspp_LDADD = \
        src/ui/libuicommon.la \
        src/libpspp.la \
        src/libpspp-core.la \
+       $(CAIRO_LIBS) \
        $(NCURSES_LIBS) \
-       $(LIBICONV) \
-       @LIBINTL@ @LIBREADLINE@
+       $(LIBREADLINE) \
+       $(GSL_LIBS)
 
 
 src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)