Merge commit 'origin/stable'

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

diff --git a/src/language/data-io/automake.mk b/src/language/data-io/automake.mk
index a0510caeea4b5fac03a6f5828c3b418223a281c5..ca003d1d765f73196c590de045b22a44c2a7fe61 100644 (file)
--- a/src/language/data-io/automake.mk
+++ b/src/language/data-io/automake.mk
@@ -1,30 +1,33 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
+src_language_data_io_built_sources = \
+       src/language/data-io/file-handle.c \
+       src/language/data-io/list.c
 
-noinst_LIBRARIES += src/language/data-io/libdata_io.a
-
-src_language_data_io_q_sources_q =  src/language/data-io/file-handle.q src/language/data-io/list.q
-
-src_language_data_io_q_sources_c =  src/language/data-io/file-handle.c src/language/data-io/list.c
-
-EXTRA_DIST += $(src_language_data_io_q_sources_q)
-nodist_src_language_data_io_libdata_io_a_SOURCES = $(src_language_data_io_q_sources_c)
-CLEANFILES += $(src_language_data_io_q_sources_c)
-
-src_language_data_io_libdata_io_a_SOURCES = \
+language_data_io_sources = \
+       src/language/data-io/combine-files.c \
        src/language/data-io/data-list.c \
-       src/language/data-io/file-type.c \
-       src/language/data-io/file-type.h \
-       src/language/data-io/get.c \
-       src/language/data-io/inpt-pgm.c \
-       src/language/data-io/inpt-pgm.h \
-       src/language/data-io/print.c \
-       src/language/data-io/matrix-data.c   \
-       src/language/data-io/data-list.h \
+       src/language/data-io/data-parser.c \
+       src/language/data-io/data-parser.h \
        src/language/data-io/data-reader.c \
        src/language/data-io/data-reader.h \
        src/language/data-io/data-writer.c \
        src/language/data-io/data-writer.h \
-       src/language/data-io/file-handle.h
+       src/language/data-io/file-handle.h \
+       src/language/data-io/get-data.c \
+       src/language/data-io/get.c \
+       src/language/data-io/inpt-pgm.c \
+       src/language/data-io/inpt-pgm.h \
+       src/language/data-io/placement-parser.c \
+       src/language/data-io/placement-parser.h \
+       src/language/data-io/print-space.c \
+       src/language/data-io/print.c \
+       src/language/data-io/save.c \
+       src/language/data-io/trim.c \
+       src/language/data-io/trim.h
 
+all_q_sources += $(src_language_data_io_built_sources:.c=.q)
+EXTRA_DIST += $(src_language_data_io_built_sources:.c=.q)
+CLEANFILES += $(src_language_data_io_built_sources)
 
+EXTRA_DIST += src/language/data-io/OChangeLog