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 0684e313caa0638369df94207516d0990a3ac97f..ae6d3a5e2d72af46d7d30dae304987708f71106a 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -13,7 +13,7 @@ src_ui_terminal_libui_a_SOURCES = \
        src/ui/terminal/terminal.c \
        src/ui/terminal/terminal.h      
 
-src_ui_terminal_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
+src_ui_terminal_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\" $(NCURSES_CFLAGS)
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
@@ -26,7 +26,6 @@ src_ui_terminal_pspp_LDADD = \
        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  \
@@ -34,6 +33,7 @@ src_ui_terminal_pspp_LDADD = \
        src/libpspp/libpspp.a \
        $(LIBXML2_LIBS) \
        $(PG_LIBS) \
+       $(NCURSES_LIBS) \
        $(LIBICONV) \
        gl/libgl.la \
        @LIBINTL@ @LIBREADLINE@
@@ -41,6 +41,8 @@ src_ui_terminal_pspp_LDADD = \
 
 
 
+src_ui_terminal_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