X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fautomake.mk;h=4180591f1a667e2bdb9a3edc36aa425f3615cd88;hb=7a2bc16d86f90a796e4c42a6c3f3908231bbe8e9;hp=cd47b62e7863af1859a725b206225526fa4363e8;hpb=8af88c0b7ea2fe75df7e45497988ed0371006a86;p=pspp

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index cd47b62e78..4180591f1a 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,10 +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@ \
-	$(LIB_CLOSE)
+	$(LTLIBREADLINE) \
+	$(GSL_LIBS)
 
 
 src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
@@ -36,5 +33,3 @@ src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
 if RELOCATABLE_VIA_LD
 src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 endif
-
-EXTRA_DIST += src/ui/terminal/OChangeLog