Merge commit 'origin/covariance'

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

diff --git a/src/data/automake.mk b/src/data/automake.mk
index bd161dba469147a3c2c7cfa029e99fded534c17d..19403cf7f3ae95ee48ce6635c756d3a0d9d25545 100644 (file)
--- a/src/data/automake.mk
+++ b/src/data/automake.mk
@@ -1,4 +1,3 @@
-
 noinst_LTLIBRARIES += src/data/libdata.la
 
 src_data_libdata_la_CPPFLAGS = $(LIBXML2_CFLAGS) $(PG_CFLAGS) $(AM_CPPFLAGS) 
@@ -16,15 +15,21 @@ src_data_libdata_la_SOURCES = \
        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 \
@@ -37,8 +42,6 @@ src_data_libdata_la_SOURCES = \
        src/data/case.h \
        src/data/case-tmpfile.c \
        src/data/case-tmpfile.h \
-       src/data/category.c \
-       src/data/category.h \
        src/data/data-in.c \
        src/data/data-in.h \
        src/data/data-out.c \
@@ -68,6 +71,8 @@ src_data_libdata_la_SOURCES = \
        src/data/missing-values.h \
        src/data/make-file.c \
        src/data/make-file.h \
+       src/data/mrset.c \
+       src/data/mrset.h \
        src/data/procedure.c \
        src/data/procedure.h \
        src/data/por-file-reader.c \
@@ -86,8 +91,8 @@ src_data_libdata_la_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 \