diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2020-06-29 10:51:11 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2020-06-29 10:51:11 +0300 |
commit | 34b9d0566dbee4b3a4ddfa4cbf23b9c689393fb8 (patch) | |
tree | 63b3830d3fdb0c6354f3550f23fdc3b5ea7ca24a | |
parent | eb98370ae03aa778d0a69df83f6f4a5cecff0b38 (diff) | |
download | grecs-34b9d0566dbee4b3a4ddfa4cbf23b9c689393fb8.tar.gz grecs-34b9d0566dbee4b3a4ddfa4cbf23b9c689393fb8.tar.bz2 |
Fix parrallel builds. Fix memory leak in wordsplit.
-rw-r--r-- | src/Make.am | 85 |
1 files changed, 41 insertions, 44 deletions
diff --git a/src/Make.am b/src/Make.am index 5199991..9a67037 100644 --- a/src/Make.am +++ b/src/Make.am | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of grecs - Gray's Extensible Configuration System | 1 | # This file is part of grecs - Gray's Extensible Configuration System |
2 | # Copyright (C) 2007-2019 Sergey Poznyakoff | 2 | # Copyright (C) 2007-2020 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Grecs is free software; you can redistribute it and/or modify | 4 | # Grecs is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -15,34 +15,10 @@ | |||
15 | # along with Grecs. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with Grecs. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | ||
17 | PARSER_DEFS = | 17 | PARSER_DEFS = |
18 | 18 | BUILT_SOURCES = grecs-gram.h | |
19 | if GRECS_COND_META1_PARSER | 19 | EXTRA_DIST=\ |
20 | GRECS_PARSER_META1 = meta1-gram.y meta1-lex.l | 20 | $(PP_SETUP_FILE)\ |
21 | GRECS_EXTRA_META1 = meta1-gram.h | 21 | Make.am Make-inst.am Make-shared.am Make-static.am |
22 | PARSER_DEFS += -DENABLE_META1_PARSER | ||
23 | endif | ||
24 | |||
25 | if GRECS_COND_BIND_PARSER | ||
26 | GRECS_PARSER_BIND = bind-gram.y bind-lex.l | ||
27 | GRECS_EXTRA_BIND = bind-gram.h | ||
28 | PARSER_DEFS += -DENABLE_BIND_PARSER | ||
29 | endif | ||
30 | |||
31 | if GRECS_COND_DHCPD_PARSER | ||
32 | GRECS_PARSER_DHCPD = dhcpd-gram.y dhcpd-lex.l | ||
33 | GRECS_EXTRA_DHCPD = dhcpd-gram.h | ||
34 | PARSER_DEFS += -DENABLE_DHCPD_PARSER | ||
35 | endif | ||
36 | |||
37 | if GRECS_COND_GIT_PARSER | ||
38 | GRECS_PARSER_GIT = git-parser.c | ||
39 | PARSER_DEFS += -DENABLE_GIT_PARSER | ||
40 | endif | ||
41 | |||
42 | if GRECS_COND_JSON | ||
43 | GRECS_JSON = json-gram.y json-lex.l jsonfmt.c | ||
44 | GRECS_EXTRA_JSON = json-gram.h | ||
45 | endif | ||
46 | 22 | ||
47 | GRECS_SRC = \ | 23 | GRECS_SRC = \ |
48 | asprintf.c\ | 24 | asprintf.c\ |
@@ -52,6 +28,7 @@ GRECS_SRC = \ | |||
52 | format.c\ | 28 | format.c\ |
53 | grecs-gram.y\ | 29 | grecs-gram.y\ |
54 | grecs-lex.l\ | 30 | grecs-lex.l\ |
31 | grecs-gram.h\ | ||
55 | ipstr.c\ | 32 | ipstr.c\ |
56 | join.c\ | 33 | join.c\ |
57 | lineacc.c\ | 34 | lineacc.c\ |
@@ -68,12 +45,41 @@ GRECS_SRC = \ | |||
68 | text.c\ | 45 | text.c\ |
69 | tree.c\ | 46 | tree.c\ |
70 | txtacc.c\ | 47 | txtacc.c\ |
71 | version.c\ | 48 | version.c |
72 | $(GRECS_JSON)\ | 49 | |
73 | $(GRECS_PARSER_BIND)\ | 50 | grecs-gram.h: grecs-gram.c |
74 | $(GRECS_PARSER_DHCPD)\ | 51 | |
75 | $(GRECS_PARSER_GIT)\ | 52 | if GRECS_COND_META1_PARSER |
76 | $(GRECS_PARSER_META1) | 53 | GRECS_SRC += meta1-gram.y meta1-lex.l meta1-gram.h |
54 | BUILT_SOURCES += meta1-gram.h | ||
55 | PARSER_DEFS += -DENABLE_META1_PARSER | ||
56 | meta1-gram.h: meta1-gram.c | ||
57 | endif | ||
58 | |||
59 | if GRECS_COND_BIND_PARSER | ||
60 | GRECS_SRC += bind-gram.y bind-lex.l bind-gram.h | ||
61 | BUILT_SOURCES += bind-gram.h | ||
62 | PARSER_DEFS += -DENABLE_BIND_PARSER | ||
63 | bind-gram.h: bind-gram.c | ||
64 | endif | ||
65 | |||
66 | if GRECS_COND_DHCPD_PARSER | ||
67 | GRECS_SRC += dhcpd-gram.y dhcpd-lex.l dhcpd-gram.h | ||
68 | BUILT_SOURCES += dhcpd-gram.h | ||
69 | PARSER_DEFS += -DENABLE_DHCPD_PARSER | ||
70 | dhcpd-gram.h: dhcpd-gram.c | ||
71 | endif | ||
72 | |||
73 | if GRECS_COND_GIT_PARSER | ||
74 | GRECS_SRC += git-parser.c | ||
75 | PARSER_DEFS += -DENABLE_GIT_PARSER | ||
76 | endif | ||
77 | |||
78 | if GRECS_COND_JSON | ||
79 | GRECS_SRC += json-gram.y json-lex.l jsonfmt.c json-gram.h | ||
80 | BUILT_SOURCES += json-gram.h | ||
81 | json-gram.h: json-gram.c | ||
82 | endif | ||
77 | 83 | ||
78 | VPATH += $(top_srcdir)/@GRECS_SUBDIR@/wordsplit | 84 | VPATH += $(top_srcdir)/@GRECS_SUBDIR@/wordsplit |
79 | NODIST_GRECS_SRC = wordsplit.c | 85 | NODIST_GRECS_SRC = wordsplit.c |
@@ -82,15 +88,6 @@ if GRECS_COND_SOCKADDR_LIST | |||
82 | GRECS_SRC += sockaddr.c | 88 | GRECS_SRC += sockaddr.c |
83 | endif | 89 | endif |
84 | 90 | ||
85 | EXTRA_DIST=\ | ||
86 | grecs-gram.h\ | ||
87 | $(GRECS_EXTRA_BIND)\ | ||
88 | $(GRECS_EXTRA_DHCPD)\ | ||
89 | $(GRECS_EXTRA_JSON)\ | ||
90 | $(GRECS_EXTRA_META1)\ | ||
91 | $(PP_SETUP_FILE)\ | ||
92 | Make.am Make-inst.am Make-shared.am Make-static.am | ||
93 | |||
94 | AM_CPPFLAGS = \ | 91 | AM_CPPFLAGS = \ |
95 | -I$(srcdir)\ | 92 | -I$(srcdir)\ |
96 | -I$(top_srcdir)/@GRECS_SUBDIR@\ | 93 | -I$(top_srcdir)/@GRECS_SUBDIR@\ |