X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fautomake.mk;h=4c714f20dc883041d8b2369e744ba7651242a2ad;hb=c2e1546a6427909b6ed81cc7fa4ed256614ba888;hp=c8368e8c985c36d91d151e89bf98681b4a677f9a;hpb=e6ae2a61e5356694c09f48da74407f8054a04e8d;p=pspp

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index c8368e8c98..4c714f20dc 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -9,21 +9,20 @@ src_libpspp_libpspp_a_SOURCES = \
 	src/libpspp/array.c \
 	src/libpspp/array.h \
 	src/libpspp/assertion.h \
-	src/libpspp/alloc.c \
-	src/libpspp/alloc.h \
 	src/libpspp/bit-vector.h \
-	src/libpspp/legacy-encoding.c \
-	src/libpspp/legacy-encoding.h \
+	src/libpspp/bt.c \
+	src/libpspp/bt.h \
+	src/libpspp/compiler.h \
 	src/libpspp/copyleft.c \
 	src/libpspp/copyleft.h \
-	src/libpspp/compiler.h \
+	src/libpspp/deque.c \
 	src/libpspp/deque.h \
 	src/libpspp/float-format.c \
 	src/libpspp/float-format.h \
 	src/libpspp/freaderror.c \
 	src/libpspp/freaderror.h \
-	src/libpspp/getl.h \
 	src/libpspp/getl.c \
+	src/libpspp/getl.h \
 	src/libpspp/hash.c \
 	src/libpspp/hash.h \
 	src/libpspp/heap.c \
@@ -32,26 +31,38 @@ src_libpspp_libpspp_a_SOURCES = \
 	src/libpspp/i18n.h \
 	src/libpspp/integer-format.c \
 	src/libpspp/integer-format.h \
-	src/libpspp/msg-locator.c \
-	src/libpspp/msg-locator.h \
+	src/libpspp/legacy-encoding.c \
+	src/libpspp/legacy-encoding.h \
 	src/libpspp/ll.c \
 	src/libpspp/ll.h \
 	src/libpspp/llx.c \
 	src/libpspp/llx.h \
-	src/libpspp/magic.c \
-	src/libpspp/magic.h \
+	src/libpspp/message.c \
+	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 \
 	src/libpspp/pool.h \
-	src/libpspp/syntax-gen.c \
-	src/libpspp/syntax-gen.h \
-	src/libpspp/message.c \
-	src/libpspp/message.h \
+	src/libpspp/range-map.c \
+	src/libpspp/range-map.h \
+	src/libpspp/range-set.c \
+	src/libpspp/range-set.h \
+	src/libpspp/sparse-array.c \
+	src/libpspp/sparse-array.h \
 	src/libpspp/start-date.c \
 	src/libpspp/start-date.h \
 	src/libpspp/str.c \
 	src/libpspp/str.h \
+	src/libpspp/syntax-gen.c \
+	src/libpspp/syntax-gen.h \
+	src/libpspp/taint.c \
+	src/libpspp/taint.h \
+	src/libpspp/tower.c \
+	src/libpspp/tower.h \
 	src/libpspp/verbose-msg.c \
 	src/libpspp/verbose-msg.h \
 	src/libpspp/version.h 
@@ -63,7 +74,7 @@ src_libpspp_libpspp_a_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
 nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c
 
 src/libpspp/version.c: $(top_srcdir)/AUTHORS
-	@$(top_srcdir)/mkinstalldirs  src/libpspp
+	@$(MKDIR_P) src/libpspp
 	echo "/* 	-*- mode: c; buffer-read-only: t -*-" > $@
 	echo "   Generated by src/libpspp/automake.mk --- Do not edit. */">> $@
 	echo "#include \"version.h\"" >> $@
@@ -74,9 +85,9 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS
 	echo "const char host_system[] = \"$(host_triplet)\";" >> $@
 	echo "const char build_system[] = \"$(build_triplet)\";" >> $@
 	echo "const char default_config_path[] =\
-\"~/.pspp:$(pkgsysconfdir)\";" >> $@
+\"\$$HOME/.pspp:$(pkgsysconfdir)\";" >> $@
 	echo "const char include_path[] =\
-\"./:~/.pspp/include:$(pkgdatadir)\";" >> $@
+\"./:\$$HOME/.pspp/include:$(pkgdatadir)\";" >> $@
 	echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@
 	echo "const char *const authors[] = {" >> $@
 	sed -e 's/^/  \"/' -e 's/$$/\",/' $(top_srcdir)/AUTHORS >> $@