X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fautomake.mk;h=73796bd648aa31abd3d05453ce0bbf16bf181355;hb=ac4a498528bce608cd2009bef01fd08d049a02af;hp=1c56ca6164fc98c1a6cd9b5f88c379c20dc520f1;hpb=c3bd77adba5746aae895e6a354aada4e694c0e3f;p=pspp

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 1c56ca6164..73796bd648 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -1,19 +1,20 @@
 ## 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/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 \
@@ -25,14 +26,22 @@ 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 \
 	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 \
@@ -55,43 +64,55 @@ src_libpspp_libpspp_a_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-set.c \
+	src/libpspp/stringi-set.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/tmpfile.c \
+	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 
+	src/libpspp/version.h \
+	src/libpspp/zip-writer.c \
+	src/libpspp/zip-writer.h
 
 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
+src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 	@$(MKDIR_P) src/libpspp
 	echo "/* 	-*- mode: c; buffer-read-only: t -*-" > $@
-	echo "   Generated by src/libpspp/automake.mk --- Do not edit. */">> $@
+	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_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 >> $@
 	echo "0 };" >> $@
 
+
+EXTRA_DIST += src/libpspp/OChangeLog