Use @VARIABLE@ instead of $(VARIABLE) consistently in Makefiles.

[pspp-builds.git] / src / ui / terminal / automake.mk

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 7411bbd33161430ef5d4452571c4683db48386c2..9cde11c9110641e1c6f39fa1aa4de959865cb74b 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -1,39 +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/read-line.c src/ui/terminal/read-line.h  \
- src/ui/terminal/main.c
+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_la_CFLAGS = $(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      \
-       @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 \
+       $(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