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

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index ae6d3a5e..5ab09857 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -1,48 +1,39 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-noinst_LIBRARIES += src/ui/terminal/libui.a
+noinst_LTLIBRARIES += src/ui/terminal/libui.la
 
-src_ui_terminal_libui_a_SOURCES = \
-	src/ui/terminal/command-line.c \
-	src/ui/terminal/command-line.h \
+src_ui_terminal_libui_la_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.h \
 	src/ui/terminal/terminal.c \
-	src/ui/terminal/terminal.h	
+	src/ui/terminal/terminal.h \
+	src/ui/terminal/terminal-opts.c \
+	src/ui/terminal/terminal-opts.h	
 
-src_ui_terminal_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\" $(NCURSES_CFLAGS)
 
-bin_PROGRAMS += src/ui/terminal/pspp
+src_ui_terminal_libui_la_CFLAGS = -DINSTALLDIR=\"$(bindir)\" $(NCURSES_CFLAGS)
 
+bin_PROGRAMS += src/ui/terminal/pspp
 
 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) \
+	src/ui/terminal/libui.la \
+	src/ui/libuicommon.la \
+	src/libpspp.la \
+	src/libpspp-core.la \
 	$(NCURSES_LIBS) \
 	$(LIBICONV) \
-	gl/libgl.la \
 	@LIBINTL@ @LIBREADLINE@
 
 
-
-
-src_ui_terminal_pspp_LDFLAGS = $(PG_LDFLAGS)
+src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
 
 if RELOCATABLE_VIA_LD
 src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 endif
+
+EXTRA_DIST += src/ui/terminal/OChangeLog