X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fautomake.mk;h=936be197e5d1268ebe0de5aba58d337db4b9d03d;hb=49aaf665f7ad1fed25d23b6ccb0da1c5461c4846;hp=cc33e32be23f222510108bae4e93834599941200;hpb=4d86bb87eedc899cdfe0df8f9f2367080db8c7cc;p=pspp

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index cc33e32be2..936be197e5 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -1,42 +1,50 @@
+# PSPP - a program for statistical analysis.
+# Copyright (C) 2017 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 ## 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/terminal-opts.c \
+	src/ui/terminal/terminal-opts.h	\
+	src/ui/terminal/terminal-reader.c \
+	src/ui/terminal/terminal-reader.h
 
+src_ui_terminal_libui_la_CFLAGS = $(NCURSES_CFLAGS)
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
-src_ui_terminal_pspp_SOURCES = \
-	src/procedure.c \
-	src/procedure.h
-
-src_ui_terminal_pspp_LDADD =					\
-	$(top_builddir)/src/language/expressions/libexpressions.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/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)/src/ui/terminal/libui.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_SOURCES =
 
+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) \
+	$(LIB_GETRANDOM)
+
+
+src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
+
+if RELOCATABLE_VIA_LD
+src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+endif