Makefiles: Add $(AM_V_GEN) and $(AM_V_at) to a few more rules.
[pspp] / src / libpspp / automake.mk
index 73796bd648aa31abd3d05453ce0bbf16bf181355..ca8bac6b4996ec71126c423113039c7c32c2d82b 100644 (file)
@@ -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,21 +15,25 @@ 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 \
        src/libpspp/deque.c \
        src/libpspp/deque.h \
+       src/libpspp/encoding-guesser.c \
+       src/libpspp/encoding-guesser.h \
+       src/libpspp/ext-array.c \
+       src/libpspp/ext-array.h \
        src/libpspp/float-format.c \
        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 \
@@ -42,8 +46,8 @@ src_libpspp_libpspp_la_SOURCES = \
        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/line-reader.c \
+       src/libpspp/line-reader.h \
        src/libpspp/ll.c \
        src/libpspp/ll.h \
        src/libpspp/llx.c \
@@ -54,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 \
@@ -74,45 +80,53 @@ src_libpspp_libpspp_la_SOURCES = \
        src/libpspp/string-map.h \
        src/libpspp/string-set.c \
        src/libpspp/string-set.h \
+       src/libpspp/stringi-map.c \
+       src/libpspp/stringi-map.h \
        src/libpspp/stringi-set.c \
        src/libpspp/stringi-set.h \
        src/libpspp/str.c \
        src/libpspp/str.h \
        src/libpspp/taint.c \
        src/libpspp/taint.h \
-       src/libpspp/tmpfile.c \
-       src/libpspp/tmpfile.h \
+       src/libpspp/temp-file.c \
+       src/libpspp/temp-file.h \
        src/libpspp/tower.c \
        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 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
+       $(AM_V_at)mv $@,tmp $@