Greatly simplify PSPP configuration.

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

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 59ac613dc0176e75b4a86e69140e926e5255fbbe..0172d80fd07a83570b077f53b4900428c69a5d7a 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -68,6 +68,8 @@ src_libpspp_libpspp_la_SOURCES = \
        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 \
@@ -80,8 +82,6 @@ src_libpspp_libpspp_la_SOURCES = \
        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 
 
 DISTCLEANFILES+=src/libpspp/version.c
@@ -105,10 +105,6 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
 (`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 >> $@