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=ecdcb3c2e68d72c77533fe1e917ce12504840b34;hpb=57b436a22d9ae0e395fb2e3ce101c2b5c2e6939e;p=pspp

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index ecdcb3c2e6..4180591f1a 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -1,43 +1,35 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-noinst_LIBRARIES += src/ui/terminal/libui.a
+noinst_LTLIBRARIES += src/ui/terminal/libui.la
 
-src_ui_terminal_libui_a_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_libui_la_SOURCES = \
 	src/ui/terminal/main.c \
-	src/ui/terminal/msg-ui.c \
-	src/ui/terminal/msg-ui.h
+	src/ui/terminal/terminal-opts.c \
+	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 = $(NCURSES_CFLAGS)
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
 src_ui_terminal_pspp_SOURCES =
 
-src_ui_terminal_pspp_LDADD =					\
-	src/ui/terminal/libui.a \
-	src/language/liblanguage.a \
-	src/language/tests/libtests.a \
-	src/ui/libuicommon.a \
-	src/language/utilities/libutilities.a \
-	src/language/control/libcontrol.a \
-	src/language/expressions/libexpressions.a \
-	src/language/stats/libstats.a \
-	src/language/xforms/libxforms.a \
-	src/language/dictionary/libcmddict.a \
-	src/language/lexer/liblexer.a \
-	src/language/data-io/libdata_io.a \
-	src/output/charts/libcharts.a \
-	src/output/liboutput.a \
-	src/math/libpspp_math.a  \
-	src/math/linreg/libpspp_linreg.a  \
-	lib/linreg/liblinreg.a	\
-	lib/gsl-extras/libgsl-extras.a	\
-	src/data/libdata.a \
-	src/libpspp/libpspp.a \
-	gl/libgl.a	\
-	$(LIBICONV) \
-	@LIBINTL@ @LIBREADLINE@
+src_ui_terminal_pspp_LDADD = \
+	src/ui/terminal/libui.la \
+	src/ui/libuicommon.la \
+	src/libpspp.la \
+	src/libpspp-core.la \
+	$(CAIRO_LIBS) \
+	$(NCURSES_LIBS) \
+	$(LTLIBREADLINE) \
+	$(GSL_LIBS)
 
+
+src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
+
+if RELOCATABLE_VIA_LD
+src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+endif