summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/Makefile26
-rw-r--r--conf/cf-lex.l2
2 files changed, 15 insertions, 13 deletions
diff --git a/conf/Makefile b/conf/Makefile
index e448189..270d556 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,24 +1,26 @@
-CONFS=$(TOPDIR)/conf/confbase.Y @CONFS@$(addprefix $(TOPDIR)/,$(addsuffix /config.Y,$(BASEDIRS)))
-OBJS=cf-parse.tab.o cf-lex.o
-CONF=$(TOPDIR)/conf
+source=cf-parse.tab.c cf-lex.c
+root-rel=../
+
+include ../Rules
+
+conf-src=$(srcdir)/conf
+conf-fragments=$(conf-src)/confbase.Y @CONFS@ $(addsuffix /config.Y,$(static-dir-paths))
ifdef DEBUG
BISON_DEBUG=-t
#FLEX_DEBUG=-d
endif
-include $(TOPDIR)/Rules
-
cf-parse.tab.c cf-parse-tab.h: cf-parse.y
- bison -bcf-parse -dv -pcf_ $(BISON_DEBUG) cf-parse.y
+ $(BISON) -bcf-parse -dv -pcf_ $(BISON_DEBUG) cf-parse.y
-cf-parse.y: $(CONFS) $(CONF)/gen_parser.m4
- m4 -P $(CONF)/gen_parser.m4 $(CONFS) >cf-parse.y
+cf-parse.y: $(conf-fragments) $(conf-src)/gen_parser.m4
+ $(M4) -P $(conf-src)/gen_parser.m4 $(conf-fragments) >cf-parse.y
-keywords.h: $(CONFS) $(CONF)/gen_keywords.m4
- m4 -P $(CONF)/gen_keywords.m4 $(CONFS) >keywords.h
+keywords.h: $(conf-fragments) $(conf-src)/gen_keywords.m4
+ $(M4) -P $(conf-src)/gen_keywords.m4 $(conf-fragments) >keywords.h
cf-lex.c: cf-lex.l
- flex $(FLEX_DEBUG) -sB8 -ocf-lex.c -Pcf_ cf-lex.l
+ $(FLEX) $(FLEX_DEBUG) -sB8 -ocf-lex.c -Pcf_ cf-lex.l
-dep: keywords.h
+depend: keywords.h cf-parse.tab.c cf-lex.c
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 9e6b120..7c37a00 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -24,7 +24,7 @@ static struct keyword {
int value;
struct keyword *next;
} keyword_list[] = {
-#include "keywords.h"
+#include "conf/keywords.h"
{ NULL, -1 } };
#define KW_HASH_SIZE 64