automake: adapt for changes in 2.1.4.

This commit is contained in:
Thomas Klausner 2015-09-08 11:45:10 +02:00
parent 4459dfeafc
commit 54479316c7
3 changed files with 8 additions and 6 deletions

1
.gitignore vendored
View file

@ -57,6 +57,7 @@ test_join_bucket_keeper
test_lrec
test_mlrutil
test_parse_trie
test_peek_file_reader
test_string_builder
test_byte_readers
c/dsls/lemon_prepared

View file

@ -7,13 +7,12 @@ libinput_la_SOURCES= \
file_reader_stdio.c \
file_reader_stdio.h \
lrec_reader.h \
lrec_reader_csvex.c \
lrec_reader_csv.c \
lrec_reader_in_memory.c \
lrec_reader_mmap_csvlite.c \
lrec_reader_mmap_dkvp.c \
lrec_reader_mmap_nidx.c \
lrec_reader_mmap_xtab.c \
lrec_reader_stdio_csv.c \
lrec_reader_stdio_csvlite.c \
lrec_reader_stdio_dkvp.c \
lrec_reader_stdio_nidx.c \
@ -21,8 +20,7 @@ libinput_la_SOURCES= \
lrec_readers.c \
lrec_readers.h \
mmap_byte_reader.c \
old_peek_file_reader.c \
old_peek_file_reader.h \
peek_file_reader.c \
peek_file_reader.h \
stdio_byte_reader.c \
string_byte_reader.c
@ -31,10 +29,13 @@ libinput_la_CPPFLAGS= -I${srcdir}/../
libinput_la_CFLAGS= -std=gnu99
TESTS= $(check_PROGRAMS)
check_PROGRAMS= test_byte_readers
check_PROGRAMS= test_byte_readers test_peek_file_reader
test_byte_readers_LDADD= libinput.la \
../lib/libmlr.la
test_byte_readers_CPPFLAGS= -D__TEST_BYTE_READERS_MAIN__ ${AM_CPPFLAGS}
test_peek_file_reader_LDADD= libinput.la
test_peek_file_reader_CPPFLAGS= -D__TEST_PEEK_FILE_READER_MAIN__ ${AM_CPPFLAGS}
AM_CPPFLAGS= -I${srcdir}/../

View file

@ -1,6 +1,6 @@
AC_PREREQ([2.60])
# Manually increment on updates to https://github.com/johnkerl/miller/releases
AC_INIT([mlr],[2.1.3])
AC_INIT([mlr],[2.1.4])
AC_CONFIG_SRCDIR([c/mlrmain.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([autotools])