Use @VARIABLE@ instead of $(VARIABLE) consistently in Makefiles.

[pspp-builds.git] / src / libpspp / automake.mk

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index aaaa45b40459d09cd121e05ecd170e5f15d0bcd0..746756d8900ba0207e45ae77718ed8dbab8dda91 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -6,6 +6,8 @@ noinst_LTLIBRARIES += src/libpspp/libpspp.la
 src_libpspp_libpspp_la_SOURCES = \
        src/libpspp/abt.c \
        src/libpspp/abt.h \
+       src/libpspp/argv-parser.c \
+       src/libpspp/argv-parser.h \
        src/libpspp/array.c \
        src/libpspp/array.h \
        src/libpspp/assertion.h \
@@ -23,10 +25,16 @@ src_libpspp_libpspp_la_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 \
@@ -53,12 +61,16 @@ src_libpspp_libpspp_la_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/str.c \
        src/libpspp/str.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 \
@@ -71,14 +83,18 @@ src_libpspp_libpspp_la_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
 
 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)\";" >> $@