moved src/math/linreg.[ch] to src/math

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

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 805cd6c2e48949d7930c97e7661078946a8653de..ae6d3a5e2d72af46d7d30dae304987708f71106a 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -8,36 +8,41 @@ src_ui_terminal_libui_a_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.c \
+       src/ui/terminal/msg-ui.h \
+       src/ui/terminal/terminal.c \
+       src/ui/terminal/terminal.h      
 
+src_ui_terminal_libui_a_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.a \
+       src/language/liblanguage.a \
+       src/output/charts/libcharts.a \
+       src/output/liboutput.a \
+       src/math/libpspp_math.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) \
+       $(NCURSES_LIBS) \
+       $(LIBICONV) \
+       gl/libgl.la \
        @LIBINTL@ @LIBREADLINE@
 
+
+
+
+src_ui_terminal_pspp_LDFLAGS = $(PG_LDFLAGS)
+
+if RELOCATABLE_VIA_LD
+src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+endif