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

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 0684e313..ae6d3a5e 100644
--- 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