X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fautomake.mk;h=34bed5ae366b886a84789dc8b7e6505bc8e0654f;hb=bd64b7f8def9cbbf882f31ae34ecec86cbfd6093;hp=cfc06bf1042498dcf0e80665071219a4e488c348;hpb=09a1109ddc398f36fe720208e1d38053850cbd2a;p=pspp-builds.git

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index cfc06bf1..34bed5ae 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -9,27 +9,39 @@ src_ui_terminal_libui_a_SOURCES = \
 	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/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_ui_terminal_pspp_LDADD =					\
+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/math/linreg/libpspp_linreg.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