X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fautomake.mk;h=9cde11c9110641e1c6f39fa1aa4de959865cb74b;hb=d94dc663529b4e05ec1e7c47c1e73310abb1d3b4;hp=988f24d5d3828f52786929791f90960a25d17dd3;hpb=015e221b0f8578afee769528572c76387f26c629;p=pspp-builds.git

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 988f24d5..9cde11c9 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -3,17 +3,18 @@
 noinst_LTLIBRARIES += src/ui/terminal/libui.la
 
 src_ui_terminal_libui_la_SOURCES = \
-	src/ui/terminal/command-line.c \
-	src/ui/terminal/command-line.h \
 	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.h \
+	src/ui/terminal/terminal-opts.c \
+	src/ui/terminal/terminal-opts.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
 
@@ -26,10 +27,10 @@ src_ui_terminal_pspp_LDADD = \
 	src/libpspp-core.la \
 	$(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)`