X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fautomake.mk;h=2f81243cf91fbbf726b4bed5d4da506fd5b61804;hb=fa1fffd5c789d9c7875fc3bdf556eaf017cf524e;hp=90602b08a69034b8a36d125254c7d2b2c89fa782;hpb=41009f9ff6541a025357fd8e06fcdaf5220e48fa;p=pspp

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 90602b08a6..2f81243cf9 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 
-noinst_LTLIBRARIES += src/libpspp/libpspp.la
+noinst_LTLIBRARIES += src/libpspp/liblibpspp.la
 
-src_libpspp_libpspp_la_SOURCES = \
+src_libpspp_liblibpspp_la_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
 	src/libpspp/argv-parser.c \
@@ -20,16 +20,18 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/copyleft.h \
 	src/libpspp/deque.c \
 	src/libpspp/deque.h \
+	src/libpspp/encoding-guesser.c \
+	src/libpspp/encoding-guesser.h \
+	src/libpspp/ext-array.c \
+	src/libpspp/ext-array.h \
 	src/libpspp/float-format.c \
 	src/libpspp/float-format.h \
 	src/libpspp/freaderror.c \
 	src/libpspp/freaderror.h \
-	src/libpspp/getl.c \
-	src/libpspp/getl.h \
 	src/libpspp/hash-functions.c \
 	src/libpspp/hash-functions.h \
-	src/libpspp/hash.c \
-	src/libpspp/hash.h \
+	src/libpspp/inflate.c \
+	src/libpspp/inflate.h \
 	src/libpspp/heap.c \
 	src/libpspp/heap.h \
 	src/libpspp/hmap.c \
@@ -40,8 +42,10 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/i18n.h \
 	src/libpspp/integer-format.c \
 	src/libpspp/integer-format.h \
-	src/libpspp/legacy-encoding.c \
-	src/libpspp/legacy-encoding.h \
+	src/libpspp/intern.c \
+	src/libpspp/intern.h \
+	src/libpspp/line-reader.c \
+	src/libpspp/line-reader.h \
 	src/libpspp/ll.c \
 	src/libpspp/ll.h \
 	src/libpspp/llx.c \
@@ -52,41 +56,56 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/misc.h \
 	src/libpspp/model-checker.c \
 	src/libpspp/model-checker.h \
-	src/libpspp/msg-locator.c \
-	src/libpspp/msg-locator.h \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
+	src/libpspp/prompt.c \
+	src/libpspp/prompt.h \
 	src/libpspp/range-map.c \
 	src/libpspp/range-map.h \
 	src/libpspp/range-set.c \
 	src/libpspp/range-set.h \
+	src/libpspp/range-tower.c \
+	src/libpspp/range-tower.h \
 	src/libpspp/sparse-array.c \
 	src/libpspp/sparse-array.h \
 	src/libpspp/sparse-xarray.c \
 	src/libpspp/sparse-xarray.h \
 	src/libpspp/start-date.c \
 	src/libpspp/start-date.h \
+	src/libpspp/string-array.c \
+	src/libpspp/string-array.h \
 	src/libpspp/string-map.c \
 	src/libpspp/string-map.h \
 	src/libpspp/string-set.c \
 	src/libpspp/string-set.h \
+	src/libpspp/stringi-map.c \
+	src/libpspp/stringi-map.h \
+	src/libpspp/stringi-set.c \
+	src/libpspp/stringi-set.h \
 	src/libpspp/str.c \
 	src/libpspp/str.h \
 	src/libpspp/taint.c \
 	src/libpspp/taint.h \
-	src/libpspp/tmpfile.c \
-	src/libpspp/tmpfile.h \
+	src/libpspp/temp-file.c \
+	src/libpspp/temp-file.h \
 	src/libpspp/tower.c \
 	src/libpspp/tower.h \
-	src/libpspp/verbose-msg.c \
-	src/libpspp/verbose-msg.h \
-	src/libpspp/version.h 
+	src/libpspp/u8-istream.c \
+	src/libpspp/u8-istream.h \
+	src/libpspp/version.h \
+	src/libpspp/zip-private.h \
+	src/libpspp/zip-reader.c \
+	src/libpspp/zip-reader.h \
+	src/libpspp/zip-writer.c \
+	src/libpspp/zip-writer.h
 
 DISTCLEANFILES+=src/libpspp/version.c
 
-src_libpspp_libpspp_la_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
+src_libpspp_liblibpspp_la_CPPFLAGS = \
+	-I $(top_srcdir)/src/libpspp \
+	$(AM_CPPFLAGS)
 
-nodist_src_libpspp_libpspp_la_SOURCES = src/libpspp/version.c
+nodist_src_libpspp_liblibpspp_la_SOURCES = src/libpspp/version.c
 
 src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 	@$(MKDIR_P) src/libpspp
@@ -103,10 +122,6 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 (`date`).\";" >> $@
 	echo "const char host_system[] = \"$(host_triplet)\";" >> $@
 	echo "const char build_system[] = \"$(build_triplet)\";" >> $@
-	echo "const char default_config_path[] =\
-\"\$$HOME/.pspp:$(pkgsysconfdir)\";" >> $@
-	echo "const char include_path[] =\
-\"./:\$$HOME/.pspp/include:$(pkgdatadir)\";" >> $@
 	echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@
 	echo "const char *const authors[] = {" >> $@
 	sed -e 's/^/  \"/' -e 's/$$/\",/' $(top_srcdir)/AUTHORS >> $@