Made the code relocatable (using the relocate function from gnulib).

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

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 105a6b26258e18a85b4b2551b7253dfde78dd380..fd426acd02dabad257deb4538c1cdbb9132317e7 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -11,31 +11,32 @@ src_ui_terminal_libui_a_SOURCES = \
        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_ui_terminal_pspp_LDADD =                                   \
-       $(top_builddir)/src/ui/terminal/libui.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/expressions/libexpressions.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)/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_LDFLAGS = \
+       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