X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fautomake.mk;h=dfc52454eaad07a8513141361a5a4968186fa136;hb=70c7494a0b0a9e6ce90c271f65095bc474b775ee;hp=cc33e32be23f222510108bae4e93834599941200;hpb=4d86bb87eedc899cdfe0df8f9f2367080db8c7cc;p=pspp

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index cc33e32be2..dfc52454ea 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -8,35 +8,35 @@ 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_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
-src_ui_terminal_pspp_SOURCES = \
-	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/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 \
+	$(LIBICONV) \
+	gl/libgl.la \
 	@LIBINTL@ @LIBREADLINE@
 
+
+
+
+if RELOCATABLE_VIA_LD
+src_ui_terminal_pspp_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
+endif