X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fautomake.mk;h=ff8f7c28fec2b1eeedecae16853e591310021559;hb=93ec42221da8b677420bf11435e0d24d0503601b;hp=805887410b13a31b9e185ab9c7a51c6e5080a080;hpb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;p=pspp

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 805887410b..ff8f7c28fe 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 
-noinst_LTLIBRARIES += src/libpspp/libpspp.la
+noinst_LTLIBRARIES += src/libpspp/liblibpspp.la
 
-src_libpspp_libpspp_la_SOURCES = \
+src_libpspp_liblibpspp_la_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
 	src/libpspp/argv-parser.c \
@@ -15,6 +15,8 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/bt.c \
 	src/libpspp/bt.h \
 	src/libpspp/cast.h \
+	src/libpspp/cmac-aes256.c \
+	src/libpspp/cmac-aes256.h \
 	src/libpspp/compiler.h \
 	src/libpspp/copyleft.c \
 	src/libpspp/copyleft.h \
@@ -44,6 +46,8 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/integer-format.h \
 	src/libpspp/intern.c \
 	src/libpspp/intern.h \
+	src/libpspp/line-reader.c \
+	src/libpspp/line-reader.h \
 	src/libpspp/ll.c \
 	src/libpspp/ll.h \
 	src/libpspp/llx.c \
@@ -62,6 +66,8 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/range-map.h \
 	src/libpspp/range-set.c \
 	src/libpspp/range-set.h \
+	src/libpspp/range-tower.c \
+	src/libpspp/range-tower.h \
 	src/libpspp/sparse-array.c \
 	src/libpspp/sparse-array.h \
 	src/libpspp/sparse-xarray.c \
@@ -88,6 +94,8 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/tower.h \
 	src/libpspp/u8-istream.c \
 	src/libpspp/u8-istream.h \
+	src/libpspp/u8-line.c \
+	src/libpspp/u8-line.h \
 	src/libpspp/version.h \
 	src/libpspp/zip-private.h \
 	src/libpspp/zip-reader.c \
@@ -97,9 +105,11 @@ src_libpspp_libpspp_la_SOURCES = \
 
 DISTCLEANFILES+=src/libpspp/version.c
 
-src_libpspp_libpspp_la_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
+src_libpspp_liblibpspp_la_CPPFLAGS = \
+	-I $(top_srcdir)/src/libpspp \
+	$(AM_CPPFLAGS)
 
-nodist_src_libpspp_libpspp_la_SOURCES = src/libpspp/version.c
+nodist_src_libpspp_liblibpspp_la_SOURCES = src/libpspp/version.c
 
 src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 	@$(MKDIR_P) src/libpspp
@@ -113,13 +123,10 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 	echo "const char bare_version[] = \"$(VERSION)\";" >> $@
 	echo "const char version[] = \"GNU $(PACKAGE) $(VERSION)\";" >> $@
 	echo "const char stat_version[] = \"GNU $(PACKAGE) $(VERSION) \
-(`date`).\";" >> $@
+(`LC_ALL=C TZ=UTC date`).\";" >> $@
 	echo "const char host_system[] = \"$(host_triplet)\";" >> $@
 	echo "const char build_system[] = \"$(build_triplet)\";" >> $@
 	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