X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fautomake.mk;h=0172d80fd07a83570b077f53b4900428c69a5d7a;hb=16c70c9f2e041d4ff21f57c29be37e60be40c089;hp=5e434206970825c2773d9d045d7c469b4ab94fc5;hpb=5c3291dc396b795696e94f47780308fd7ace6fc4;p=pspp-builds.git

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 5e434206..0172d80f 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -14,6 +14,7 @@ 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 \
@@ -39,6 +40,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,6 +68,12 @@ 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/str.c \
 	src/libpspp/str.h \
 	src/libpspp/taint.c \
@@ -73,8 +82,6 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/tmpfile.h \
 	src/libpspp/tower.c \
 	src/libpspp/tower.h \
-	src/libpspp/verbose-msg.c \
-	src/libpspp/verbose-msg.h \
 	src/libpspp/version.h 
 
 DISTCLEANFILES+=src/libpspp/version.c
@@ -89,19 +96,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 >> $@