Name the src/libpspp convenience library consistently.

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

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index a7c92830ff710013fa2f19c30da87742980ed3ac..567e56a492ad8b08530176f0f0618c1c2fb58dc1 100644 (file)
--- 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 \
@@ -28,12 +28,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 \
@@ -56,10 +54,10 @@ 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 \
@@ -91,14 +89,19 @@ src_libpspp_libpspp_la_SOURCES = \
        src/libpspp/u8-istream.c \
        src/libpspp/u8-istream.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