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

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index d68f5c18..ae6d3a5e 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -1,48 +1,48 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-src/ui/terminal/%: AM_CPPFLAGS += \
-	-I$(top_srcdir)/src/libpspp \
-	-I$(top_srcdir)/src/data \
-	-I$(top_srcdir)/src/math \
-	-I$(top_srcdir)/src/language \
-	-I$(top_srcdir)/src/language/lexer \
-	-I$(top_srcdir)/src/output/charts \
-	-I$(top_srcdir)/src/output
-
 noinst_LIBRARIES += src/ui/terminal/libui.a
 
 src_ui_terminal_libui_a_SOURCES = \
- src/ui/terminal/command-line.c src/ui/terminal/command-line.h \
- src/ui/terminal/read-line.c src/ui/terminal/read-line.h  \
- src/ui/terminal/main.c
-
+	src/ui/terminal/command-line.c \
+	src/ui/terminal/command-line.h \
+	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.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/message.c					\
-	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/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