X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fautomake.mk;h=3fa72c41739dc0505384762c67dabe1c1ac198b8;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=598cdddd8eefaeea38196d188be9e33baeda36f0;hpb=65190c89174ad703a008c89bfc70154dff12def0;p=pspp-builds.git

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 598cdddd..3fa72c41 100644
--- 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,12 +22,13 @@ src_ui_terminal_pspp_LDADD = \
 	src/ui/libuicommon.la \
 	src/libpspp.la \
 	src/libpspp-core.la \
+	$(CAIRO_LIBS) \
 	$(NCURSES_LIBS) \
 	$(LIBICONV) \
-	@LIBINTL@ @LIBREADLINE@
+	$(LIBINTL) $(LIBREADLINE)
 
 
-src_ui_terminal_pspp_LDFLAGS = $(PG_LDFLAGS)
+src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
 
 if RELOCATABLE_VIA_LD
 src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`