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=105a6b26258e18a85b4b2551b7253dfde78dd380;hpb=81fff61a96bece351e381ad3fef8ab1248a952ba;p=pspp-builds.git

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 105a6b26..9cde11c9 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -1,41 +1,39 @@
 ## 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_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/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_libui_la_CFLAGS = $(NCURSES_CFLAGS)
+
 bin_PROGRAMS += src/ui/terminal/pspp
 
 src_ui_terminal_pspp_SOURCES =
 
-src_ui_terminal_pspp_LDADD =					\
-	$(top_builddir)/src/ui/terminal/libui.a \
-	$(top_builddir)/src/language/liblanguage.a \
-	$(top_builddir)/src/language/tests/libtests.a \
-	$(top_builddir)/src/language/utilities/libutilities.a \
-	$(top_builddir)/src/language/control/libcontrol.a \
-	$(top_builddir)/src/language/expressions/libexpressions.a \
-	$(top_builddir)/src/language/stats/libstats.a \
-	$(top_builddir)/src/language/xforms/libxforms.a \
-	$(top_builddir)/src/language/dictionary/libcmddict.a \
-	$(top_builddir)/src/language/lexer/liblexer.a \
-	$(top_builddir)/src/language/data-io/libdata_io.a \
-	$(top_builddir)/src/output/charts/libcharts.a \
-	$(top_builddir)/src/output/liboutput.a \
-	$(top_builddir)/src/math/libpspp_math.a  \
-	$(top_builddir)/src/math/linreg/libpspp_linreg.a  \
-	$(top_builddir)/lib/linreg/liblinreg.a	\
-	$(top_builddir)/lib/gsl-extras/libgsl-extras.a	\
-	$(top_builddir)/src/data/libdata.a \
-	$(top_builddir)/src/libpspp/libpspp.a \
-	$(top_builddir)/gl/libgl.a	\
-	@LIBINTL@ @LIBREADLINE@
+src_ui_terminal_pspp_LDADD = \
+	src/ui/terminal/libui.la \
+	src/ui/libuicommon.la \
+	src/libpspp.la \
+	src/libpspp-core.la \
+	$(NCURSES_LIBS) \
+	$(LIBICONV) \
+	$(LIBINTL) $(LIBREADLINE)
+
+
+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