X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fautomake.mk;h=a7c92830ff710013fa2f19c30da87742980ed3ac;hb=d3e294c031bb767336435d2f0048994103fcd47a;hp=dc512bb288907f59cc668e1ea989e8c7858f6916;hpb=7fbfc32fc3c636959b0a25b3e76609f86519e84a;p=pspp-builds.git

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index dc512bb2..a7c92830 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -6,17 +6,24 @@ noinst_LTLIBRARIES += src/libpspp/libpspp.la
 src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
+	src/libpspp/argv-parser.c \
+	src/libpspp/argv-parser.h \
 	src/libpspp/array.c \
 	src/libpspp/array.h \
 	src/libpspp/assertion.h \
 	src/libpspp/bit-vector.h \
 	src/libpspp/bt.c \
 	src/libpspp/bt.h \
+	src/libpspp/cast.h \
 	src/libpspp/compiler.h \
 	src/libpspp/copyleft.c \
 	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 \
@@ -37,8 +44,8 @@ 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/ll.c \
 	src/libpspp/ll.h \
 	src/libpspp/llx.c \
@@ -47,6 +54,8 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/message.h \
 	src/libpspp/misc.c \
 	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 \
@@ -57,17 +66,33 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/range-set.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/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-writer.c \
+	src/libpspp/zip-writer.h
 
 DISTCLEANFILES+=src/libpspp/version.c
 
@@ -81,19 +106,15 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 	echo "   Generated by src/libpspp/automake.mk --- Do not edit.">> $@
 	echo "" >> $@
 	echo "   The following line is for the benefit of the perl module" >>$@
-	echo "\$$VERSION='"@VERSION@"';" >> $@
+	echo "\$$VERSION='$(VERSION_FOR_PERL)';" >> $@
 	echo "*/" >> $@
 	echo "#include \"version.h\"" >> $@
-	echo "const char bare_version[] = \"@VERSION@\";" >> $@
-	echo "const char version[] = \"GNU @PACKAGE@ @VERSION@\";" >> $@
-	echo "const char stat_version[] = \"GNU @PACKAGE@ @VERSION@ \
+	echo "const char bare_version[] = \"$(VERSION)\";" >> $@
+	echo "const char version[] = \"GNU $(PACKAGE) $(VERSION)\";" >> $@
+	echo "const char stat_version[] = \"GNU $(PACKAGE) $(VERSION) \
 (`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 >> $@