X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fautomake.mk;h=2a3c33966f96dd23e3d6a7e422fd1a21a9426fbb;hb=5dbf5abcbed01f04422d4dead1c0ae0bb7efde4f;hp=0684e313caa0638369df94207516d0990a3ac97f;hpb=dde7b813c5747fba5d14e47f6dd82bb7b4dc7cf1;p=pspp

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 0684e313ca..2a3c33966f 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -1,46 +1,51 @@
+# 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/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/terminal.h
 
-src_ui_terminal_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
+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/output/charts/libcharts.a \
-	src/output/liboutput.a \
-	src/math/libpspp_math.a  \
-	src/math/linreg/libpspp_linreg.a  \
-	src/ui/libuicommon.a \
-	lib/linreg/liblinreg.a	\
-	lib/gsl-extras/libgsl-extras.a	\
-	src/data/libdata.a \
-	src/libpspp/libpspp.a \
-	$(LIBXML2_LIBS) \
-	$(PG_LIBS) \
-	$(LIBICONV) \
-	gl/libgl.la \
-	@LIBINTL@ @LIBREADLINE@
-
+	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)`
+src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 endif