summaryrefslogtreecommitdiffabout
path: root/src
authorSergey Poznyakoff <gray@gnu.org>2020-06-29 07:51:11 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2020-06-29 07:51:11 (GMT)
commit34b9d0566dbee4b3a4ddfa4cbf23b9c689393fb8 (patch) (side-by-side diff)
tree63b3830d3fdb0c6354f3550f23fdc3b5ea7ca24a /src
parenteb98370ae03aa778d0a69df83f6f4a5cecff0b38 (diff)
downloadgrecs-master.tar.gz
grecs-master.tar.bz2
Fix parrallel builds. Fix memory leak in wordsplit.HEADmaster
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/Make.am85
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,3 +1,3 @@
# This file is part of grecs - Gray's Extensible Configuration System
-# Copyright (C) 2007-2019 Sergey Poznyakoff
+# Copyright (C) 2007-2020 Sergey Poznyakoff
#
@@ -17,30 +17,6 @@
PARSER_DEFS =
-
-if GRECS_COND_META1_PARSER
- GRECS_PARSER_META1 = meta1-gram.y meta1-lex.l
- GRECS_EXTRA_META1 = meta1-gram.h
- PARSER_DEFS += -DENABLE_META1_PARSER
-endif
-
-if GRECS_COND_BIND_PARSER
- GRECS_PARSER_BIND = bind-gram.y bind-lex.l
- GRECS_EXTRA_BIND = bind-gram.h
- PARSER_DEFS += -DENABLE_BIND_PARSER
-endif
-
-if GRECS_COND_DHCPD_PARSER
- GRECS_PARSER_DHCPD = dhcpd-gram.y dhcpd-lex.l
- GRECS_EXTRA_DHCPD = dhcpd-gram.h
- PARSER_DEFS += -DENABLE_DHCPD_PARSER
-endif
-
-if GRECS_COND_GIT_PARSER
- GRECS_PARSER_GIT = git-parser.c
- PARSER_DEFS += -DENABLE_GIT_PARSER
-endif
-
-if GRECS_COND_JSON
- GRECS_JSON = json-gram.y json-lex.l jsonfmt.c
- GRECS_EXTRA_JSON = json-gram.h
-endif
+BUILT_SOURCES = grecs-gram.h
+EXTRA_DIST=\
+ $(PP_SETUP_FILE)\
+ Make.am Make-inst.am Make-shared.am Make-static.am
@@ -54,2 +30,3 @@ GRECS_SRC = \
grecs-lex.l\
+ grecs-gram.h\
ipstr.c\
@@ -70,8 +47,37 @@ GRECS_SRC = \
txtacc.c\
- version.c\
- $(GRECS_JSON)\
- $(GRECS_PARSER_BIND)\
- $(GRECS_PARSER_DHCPD)\
- $(GRECS_PARSER_GIT)\
- $(GRECS_PARSER_META1)
+ version.c
+
+grecs-gram.h: grecs-gram.c
+
+if GRECS_COND_META1_PARSER
+ GRECS_SRC += meta1-gram.y meta1-lex.l meta1-gram.h
+ BUILT_SOURCES += meta1-gram.h
+ PARSER_DEFS += -DENABLE_META1_PARSER
+meta1-gram.h: meta1-gram.c
+endif
+
+if GRECS_COND_BIND_PARSER
+ GRECS_SRC += bind-gram.y bind-lex.l bind-gram.h
+ BUILT_SOURCES += bind-gram.h
+ PARSER_DEFS += -DENABLE_BIND_PARSER
+bind-gram.h: bind-gram.c
+endif
+
+if GRECS_COND_DHCPD_PARSER
+ GRECS_SRC += dhcpd-gram.y dhcpd-lex.l dhcpd-gram.h
+ BUILT_SOURCES += dhcpd-gram.h
+ PARSER_DEFS += -DENABLE_DHCPD_PARSER
+dhcpd-gram.h: dhcpd-gram.c
+endif
+
+if GRECS_COND_GIT_PARSER
+ GRECS_SRC += git-parser.c
+ PARSER_DEFS += -DENABLE_GIT_PARSER
+endif
+
+if GRECS_COND_JSON
+ GRECS_SRC += json-gram.y json-lex.l jsonfmt.c json-gram.h
+ BUILT_SOURCES += json-gram.h
+json-gram.h: json-gram.c
+endif
@@ -84,11 +90,2 @@ endif
-EXTRA_DIST=\
- grecs-gram.h\
- $(GRECS_EXTRA_BIND)\
- $(GRECS_EXTRA_DHCPD)\
- $(GRECS_EXTRA_JSON)\
- $(GRECS_EXTRA_META1)\
- $(PP_SETUP_FILE)\
- Make.am Make-inst.am Make-shared.am Make-static.am
-
AM_CPPFLAGS = \

Return to:

Send suggestions and report system problems to the System administrator.