summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cmds2
-rw-r--r--Makefile2
-rw-r--r--Template2
-rw-r--r--bpf_parser.y2
-rw-r--r--bpfc/Makefile2
-rw-r--r--trafgen/Makefile2
-rw-r--r--trafgen_parser.y2
7 files changed, 7 insertions, 7 deletions
diff --git a/Cmds b/Cmds
index d7fb40c..6f030c4 100644
--- a/Cmds
+++ b/Cmds
@@ -19,7 +19,7 @@ endif
# Flex/bison related
LEX = $(Q)echo -e " LEX\t$<" && flex
-YAAC = $(Q)echo -e " YAAC\t$<" && bison
+YACC = $(Q)echo -e " YACC\t$<" && bison
# Installation related
INST = echo -e " INST\t$(1)" && install -d $(2) && \
diff --git a/Makefile b/Makefile
index b5f9448..34d64c2 100644
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@ uninstall: $(foreach tool,$(TOOLS),$(tool)_uninstall)
$(LEX) -P $(shell perl -wlne 'print $$1 if /lex-func-prefix:\s([a-z]+)/' $<) \
-o $(BUILD_DIR)/$(shell basename $< .l).yy.c $(LEX_FLAGS) $<
%.tab.o: %.y
- $(YAAC) -p $(shell perl -wlne 'print $$1 if /yaac-func-prefix:\s([a-z]+)/' $<) \
+ $(YACC) -p $(shell perl -wlne 'print $$1 if /yacc-func-prefix:\s([a-z]+)/' $<) \
-o $(BUILD_DIR)/$(shell basename $< .y).tab.c $(YAAC_FLAGS) -d $<
$(foreach tool,$(TOOLS),$(eval $(call TOOL_templ,$(tool))))
diff --git a/Template b/Template
index 7144981..0847cdb 100644
--- a/Template
+++ b/Template
@@ -4,7 +4,7 @@ define TOOL_templ
$(1) $(1)%: CFLAGS += $$($(1)-eflags)
$(1)_prehook:
$(Q)echo "$(bold)$(WHAT) $(1):$(normal)"
- $(1): $(1)_prehook $$($(1)-lex) $$($(1)-yaac) $$(patsubst %.o,$(1)/%.o,$$($(1)-objs))
+ $(1): $(1)_prehook $$($(1)-lex) $$($(1)-yacc) $$(patsubst %.o,$(1)/%.o,$$($(1)-objs))
$(1)_clean: $(1)_clean_custom
$(Q)$$(call RM,$(1)/*.o $(1)/$(1) $(1)/*.gz)
$(1)_do_install:
diff --git a/bpf_parser.y b/bpf_parser.y
index 3008fd5..73ab099 100644
--- a/bpf_parser.y
+++ b/bpf_parser.y
@@ -6,7 +6,7 @@
* Subject to the GPL, version 2.
*/
-/* yaac-func-prefix: yy */
+/* yacc-func-prefix: yy */
%{
diff --git a/bpfc/Makefile b/bpfc/Makefile
index 7e6fd45..d550c8f 100644
--- a/bpfc/Makefile
+++ b/bpfc/Makefile
@@ -13,7 +13,7 @@ bpfc-objs = xmalloc.o \
bpfc-lex = bpf_lexer.yy.o
-bpfc-yaac = bpf_parser.tab.o
+bpfc-yacc = bpf_parser.tab.o
bpfc-eflags = -I..
diff --git a/trafgen/Makefile b/trafgen/Makefile
index a7c0ddd..3369d4a 100644
--- a/trafgen/Makefile
+++ b/trafgen/Makefile
@@ -39,7 +39,7 @@ endif
trafgen-lex = trafgen_lexer.yy.o
-trafgen-yaac = trafgen_parser.tab.o
+trafgen-yacc = trafgen_parser.tab.o
trafgen-eflags = -I..
diff --git a/trafgen_parser.y b/trafgen_parser.y
index c189a51..60f1f64 100644
--- a/trafgen_parser.y
+++ b/trafgen_parser.y
@@ -6,7 +6,7 @@
* Subject to the GPL, version 2.
*/
-/* yaac-func-prefix: yy */
+/* yacc-func-prefix: yy */
%{