X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fautomake.mk;h=de7912bb08cd81f7f9bbb8bda8dc8819c72eba9f;hb=c0a213f7ed487273797d579bad952bca983240ba;hp=7cd5bbfaae42d9f8c9d3f525eec773a17b211485;hpb=5f4930cf00f1e88353b4e06baed71fb8c668cd16;p=pspp

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 7cd5bbfaae..de7912bb08 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -14,11 +14,14 @@ src_libpspp_libpspp_la_SOURCES = \
 	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/ext-array.c \
+	src/libpspp/ext-array.h \
 	src/libpspp/float-format.c \
 	src/libpspp/float-format.h \
 	src/libpspp/freaderror.c \
@@ -39,6 +42,8 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/i18n.h \
 	src/libpspp/integer-format.c \
 	src/libpspp/integer-format.h \
+	src/libpspp/intern.c \
+	src/libpspp/intern.h \
 	src/libpspp/legacy-encoding.c \
 	src/libpspp/legacy-encoding.h \
 	src/libpspp/ll.c \
@@ -65,17 +70,27 @@ src_libpspp_libpspp_la_SOURCES = \
 	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/version.h \
+	src/libpspp/zip-writer.c \
+	src/libpspp/zip-writer.h
 
 DISTCLEANFILES+=src/libpspp/version.c
 
@@ -92,16 +107,12 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 	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 >> $@