summaryrefslogtreecommitdiff
path: root/conf/Makefile
diff options
context:
space:
mode:
authorOndrej Zajicek (work) <santiago@crfreenet.org>2016-05-12 16:04:47 +0200
committerOndrej Zajicek (work) <santiago@crfreenet.org>2016-05-12 16:04:47 +0200
commit286e2011d22ea6914d5f2db5de3f11911a1fb663 (patch)
tree7caa6725f988f51fab0c3ba09a909c66c828b378 /conf/Makefile
parent0c6dfe52369a59d7f3da8ee6bc7c505e3da5c064 (diff)
Miscellaneous minor fixes
Diffstat (limited to 'conf/Makefile')
-rw-r--r--conf/Makefile19
1 files changed, 10 insertions, 9 deletions
diff --git a/conf/Makefile b/conf/Makefile
index c4121805..76fd496a 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -8,12 +8,6 @@ BISON_DEBUG=-t
#FLEX_DEBUG=-d
endif
-$(o)cf-parse.tab.h: $(o)cf-parse.tab.c
-
-$(o)cf-parse.tab.c: $(o)cf-parse.y
- echo $< $@ $(o)
- $(BISON) -b$(@:.tab.c=) -dv -pcf_ $(BISON_DEBUG) $<
-
$(conf-y-targets): $(s)confbase.Y
$(M4) -P $| $^ >$@
@@ -21,9 +15,16 @@ $(o)cf-parse.y: | $(s)gen_parser.m4
$(o)keywords.h: | $(s)gen_keywords.m4
$(o)commands.h: | $(s)gen_commands.m4 $(srcdir)/client/cmds.m4
-$(o)cf-lex.c: $(s)cf-lex.l $(o)cf-parse.tab.h $(o)keywords.h $(o)commands.h
- $(FLEX) $(FLEX_DEBUG) -s -B -8 -o$@ -Pcf_ $<
+$(o)cf-parse.tab.h: $(o)cf-parse.tab.c
+
+$(o)cf-parse.tab.c: $(o)cf-parse.y
+ $(BISON) $(BISON_DEBUG) -dv -pcf_ -b $(@:.tab.c=) $<
+
+$(o)cf-lex.c: $(s)cf-lex.l
+ $(FLEX) $(FLEX_DEBUG) -s -B -8 -Pcf_ -o $@ $<
+
+$(o)cf-lex.o: $(o)cf-parse.tab.h $(o)keywords.h
-$(addprefix $(o),cf-parse.tab.h cf-parse.tab.c cf-parse.y keywords.h commands.h cf-lex.c): $(objdir)/.dir-stamp
+$(addprefix $(o), cf-parse.y keywords.h commands.h cf-parse.tab.h cf-parse.tab.c cf-lex.c): $(objdir)/.dir-stamp
$(call clean,cf-parse.tab.h cf-parse.tab.c cf-parse.y keywords.h commands.h cf-lex.c cf-parse.output)