X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fautomake.mk;h=63b83384ada6a75162df9e8e867fc1a11896a904;hb=cb72db62c20ecab427229110820c5b053d0663c4;hp=d68f5c18eb2c3540aa14cd5e14433001c44fb4ae;hpb=65a4e29574b67921ea899b6a1d45806dca11db00;p=pspp

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index d68f5c18eb..63b83384ad 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -1,48 +1,40 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-src/ui/terminal/%: AM_CPPFLAGS += \
-	-I$(top_srcdir)/src/libpspp \
-	-I$(top_srcdir)/src/data \
-	-I$(top_srcdir)/src/math \
-	-I$(top_srcdir)/src/language \
-	-I$(top_srcdir)/src/language/lexer \
-	-I$(top_srcdir)/src/output/charts \
-	-I$(top_srcdir)/src/output
+noinst_LTLIBRARIES += src/ui/terminal/libui.la
 
-noinst_LIBRARIES += src/ui/terminal/libui.a
+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/terminal.c \
+	src/ui/terminal/terminal.h \
+	src/ui/terminal/terminal-opts.c \
+	src/ui/terminal/terminal-opts.h	
 
-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/main.c
 
+src_ui_terminal_libui_la_CFLAGS = -DINSTALLDIR=\"$(bindir)\" $(NCURSES_CFLAGS)
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
-src_ui_terminal_pspp_SOURCES =					\
-	src/message.c					\
-	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	\
+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) \
+	$(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