diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2018-03-15 13:29:52 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2018-03-15 14:12:23 +0200 |
commit | 58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2 (patch) | |
tree | 01fcd1416af582e2429f0ae8d120e2af39b8f9d9 /lib/Makefile.am | |
parent | 677473cdfc42b9fd83623902e80de946f108825c (diff) | |
download | eclat-58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2.tar.gz eclat-58a8936d30bbb18b8ad93fecfe3fe2210d1c18b2.tar.bz2 |
Upgrade grecs
* grecs: pull
* configure.ac: Enable json
* lib/Makefile.am (AM_CPPFLAGS): Use @GRECS_INCLUDES@
(libeclat_a_SOURCES): Remove json sources.
* src/Makefile.am (AM_CPPFLAGS): Use @GRECS_INCLUDES@
* tests/Makefile.am: Likewise.
* lib/json.h: Remove.
* lib/jsongrm.y: Remove.
* lib/jsonlex.l: Remove.
* tests/tjson.c: Remove.
* src/config.c (eclat_kw): Mark statically initialized memory locations
as such.
* src/mktags.c (process_tags): Use wordsplit to process quoted arguments.
* lib/bidimap.c (bidimap_config): Fill allocated memory with 0's
* lib/filemap.c (filemap_config): Likewise.
* lib/gdbmmap.c (gdbm_map_config): Likewise.
* lib/seqmap.c (seqmap_config): Likewise.
Diffstat (limited to 'lib/Makefile.am')
-rw-r--r-- | lib/Makefile.am | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 711bc98..e1ed1c3 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,5 @@ # This file is part of Eclat -# Copyright (C) 2012-2015 Sergey Poznyakoff +# Copyright (C) 2012-2018 Sergey Poznyakoff # # Eclat is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -43,10 +43,6 @@ libeclat_a_SOURCES=\ forlangrm.y\ forlanlex.l\ istore.c\ - json.h\ - jsongrm.h\ - jsongrm.y\ - jsonlex.l\ getans.c\ getyn.c\ hmac_sha1.c\ @@ -71,14 +67,11 @@ libeclat_a_SOURCES=\ $(maps) AM_LDFLAGS = $(CURL_LIBS) -AM_CPPFLAGS = -I$(top_srcdir)/grecs/src/ $(CURL_CFLAGS) +AM_CPPFLAGS = @GRECS_INCLUDES@ $(CURL_CFLAGS) forlanlex.c: forlangrm.h forlangrm.c forlangrm.h: forlangrm.y -jsonlex.c: jsongrm.h -jsongrm.c jsongrm.h: jsongrm.y - AM_YFLAGS=-tdv AM_LFLAGS=-dp |