casereader: Factor buffering shim out into separate source file.

[pspp] / src / data / automake.mk

diff --git a/src/data/automake.mk b/src/data/automake.mk
index a432e300ca114049524a3a6839045a153358df4b..efa0834f55cef23aa6f049f95703f4d750091d19 100644 (file)
--- a/src/data/automake.mk
+++ b/src/data/automake.mk
@@ -1,27 +1,35 @@
+noinst_LTLIBRARIES += src/data/libdata.la
 
-noinst_LIBRARIES += src/data/libdata.a
+src_data_libdata_la_CPPFLAGS = $(LIBXML2_CFLAGS) $(PG_CFLAGS) $(AM_CPPFLAGS) 
 
-src_data_libdata_a_CPPFLAGS = $(LIBXML2_CFLAGS) $(PG_CFLAGS) $(AM_CPPFLAGS) 
+src_data_libdata_la_LIBADD =   $(LIBXML2_LIBS) $(PG_LIBS)
 
-
-src_data_libdata_a_SOURCES = \
+src_data_libdata_la_SOURCES = \
        src/data/any-reader.c \
        src/data/any-reader.h \
        src/data/any-writer.c \
        src/data/any-writer.h \
+       src/data/attributes.c \
+       src/data/attributes.h \
        src/data/calendar.c \
        src/data/calendar.h \
        src/data/case-map.c \
        src/data/case-map.h \
-       src/data/case-ordering.c \
-       src/data/case-ordering.h \
+       src/data/case-matcher.c \
+       src/data/case-matcher.h \
+       src/data/caseproto.c \
+       src/data/caseproto.h \
        src/data/case.c \
        src/data/casegrouper.c \
        src/data/casegrouper.h \
        src/data/caseinit.c \
        src/data/caseinit.h \
        src/data/casereader-filter.c \
+       src/data/casereader-project.c \
        src/data/casereader-provider.h \
+       src/data/casereader-select.c \
+       src/data/casereader-shim.c \
+       src/data/casereader-shim.h \
        src/data/casereader-translator.c \
        src/data/casereader.c \
        src/data/casereader.h \
@@ -50,6 +58,8 @@ src_data_libdata_a_SOURCES = \
        src/data/file-handle-def.h \
        src/data/file-name.c \
        src/data/file-name.h \
+       src/data/format-guesser.c \
+       src/data/format-guesser.h \
        src/data/format.c \
        src/data/format.h \
        src/data/format.def \
@@ -81,8 +91,8 @@ src_data_libdata_a_SOURCES = \
        src/data/settings.h \
        src/data/short-names.c \
        src/data/short-names.h \
-       src/data/sparse-cases.c \
-       src/data/sparse-cases.h \
+       src/data/subcase.c \
+       src/data/subcase.h \
        src/data/sys-file-private.c \
        src/data/sys-file-private.h \
        src/data/sys-file-reader.c \
@@ -101,3 +111,5 @@ src_data_libdata_a_SOURCES = \
        src/data/variable.c \
        src/data/vector.c \
        src/data/vector.h
+
+EXTRA_DIST += src/data/OChangeLog