X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flibpspp%2Fautomake.mk;h=0c20643bbc71908cd818b1d1de81d9430ba40539;hb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;hp=ca6b7195b160243265e93302ee26b884ac584d08;hpb=9afdb54a2cdc03e14539cd2d046f1aa86f5fdb33;p=pspp-builds.git

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index ca6b7195..0c20643b 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -1,13 +1,11 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 
-noinst_LIBRARIES += src/libpspp/libpspp.a
+noinst_LTLIBRARIES += src/libpspp/libpspp.la
 
-src_libpspp_libpspp_a_SOURCES = \
+src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
-	src/libpspp/alloc.c \
-	src/libpspp/alloc.h \
 	src/libpspp/array.c \
 	src/libpspp/array.h \
 	src/libpspp/assertion.h \
@@ -25,10 +23,16 @@ src_libpspp_libpspp_a_SOURCES = \
 	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/heap.c \
 	src/libpspp/heap.h \
+	src/libpspp/hmap.c \
+	src/libpspp/hmap.h \
+	src/libpspp/hmapx.c \
+	src/libpspp/hmapx.h \
 	src/libpspp/i18n.c \
 	src/libpspp/i18n.h \
 	src/libpspp/integer-format.c \
@@ -39,14 +43,10 @@ src_libpspp_libpspp_a_SOURCES = \
 	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 \
@@ -61,8 +61,6 @@ src_libpspp_libpspp_a_SOURCES = \
 	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 \
@@ -73,9 +71,9 @@ src_libpspp_libpspp_a_SOURCES = \
 
 DISTCLEANFILES+=src/libpspp/version.c
 
-src_libpspp_libpspp_a_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
+src_libpspp_libpspp_la_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
 
-nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c
+nodist_src_libpspp_libpspp_la_SOURCES = src/libpspp/version.c
 
 src/libpspp/version.c: $(top_srcdir)/AUTHORS
 	@$(MKDIR_P) src/libpspp
@@ -89,11 +87,13 @@ 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 >> $@
 	echo "0 };" >> $@
 
+
+EXTRA_DIST += src/libpspp/OChangeLog