X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fautomake.mk;h=1a7b54f066351df7a1c66ec2e5b594c44d909dbe;hb=4641a075fdd5d09a3817e573779283067d348dd4;hp=a7c92830ff710013fa2f19c30da87742980ed3ac;hpb=d3e294c031bb767336435d2f0048994103fcd47a;p=pspp

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index a7c92830ff..1a7b54f066 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 \
@@ -28,12 +30,10 @@ src_libpspp_libpspp_la_SOURCES = \
 	src/libpspp/float-format.h \
 	src/libpspp/freaderror.c \
 	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/inflate.c \
+	src/libpspp/inflate.h \
 	src/libpspp/heap.c \
 	src/libpspp/heap.h \
 	src/libpspp/hmap.c \
@@ -46,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 \
@@ -56,14 +58,16 @@ src_libpspp_libpspp_la_SOURCES = \
 	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/prompt.c \
+	src/libpspp/prompt.h \
 	src/libpspp/range-map.c \
 	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 \
@@ -90,35 +94,41 @@ 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 \
+	src/libpspp/zip-reader.h \
 	src/libpspp/zip-writer.c \
 	src/libpspp/zip-writer.h
 
 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
-	echo "/* 	-*- mode: c; buffer-read-only: t -*-" > $@
-	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) \
-(`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
+	$(AM_V_GEN)echo "/* 	-*- mode: c; buffer-read-only: t -*-" > $@,tmp
+	$(AM_V_at)echo "   Generated by src/libpspp/automake.mk --- Do not edit.">> $@,tmp
+	$(AM_V_at)echo "" >> $@,tmp
+	$(AM_V_at)echo "   The following line is for the benefit of the perl module" >>$@,tmp
+	$(AM_V_at)echo "\$$VERSION='$(VERSION_FOR_PERL)';" >> $@,tmp
+	$(AM_V_at)echo "*/" >> $@,tmp
+	$(AM_V_at)echo "#include \"version.h\"" >> $@,tmp
+	$(AM_V_at)echo "const char bare_version[] = \"$(VERSION)\";" >> $@,tmp
+	$(AM_V_at)echo "const char version[] = \"GNU $(PACKAGE) $(VERSION)\";" >> $@,tmp
+	$(AM_V_at)echo "const char stat_version[] = \"GNU $(PACKAGE) $(VERSION) \
+$(AM_V_at)(`LC_ALL=C TZ=UTC date`).\";" >> $@,tmp
+	$(AM_V_at)echo "const char host_system[] = \"$(host_triplet)\";" >> $@,tmp
+	$(AM_V_at)echo "const char build_system[] = \"$(build_triplet)\";" >> $@,tmp
+	$(AM_V_at)echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@,tmp
+	$(AM_V_at)echo "const char examples_dir[] = \"$(examplesdir)\";" >> $@,tmp
+	$(AM_V_at)echo "const char *const authors[] = {" >> $@,tmp
+	$(AM_V_at)$(SED) -e 's/^/  \"/' -e 's/$$/\",/' $(top_srcdir)/AUTHORS >> $@,tmp
+	$(AM_V_at)echo "0 };" >> $@,tmp
+	mv $@,tmp $@