Merge pull request #349 from hzeller/fix-bison-include
Bison includes its generated header in *.cc. Generate with correct name.
This commit is contained in:
commit
a4c9919e3a
|
|
@ -256,10 +256,8 @@ parse.o: parse.cc
|
||||||
|
|
||||||
# Build this in two steps to avoid parallel build issues (see pr3462585)
|
# Build this in two steps to avoid parallel build issues (see pr3462585)
|
||||||
parse.cc: $(srcdir)/parse.y
|
parse.cc: $(srcdir)/parse.y
|
||||||
$(YACC) --verbose -t -p VL -d -o $@ $<
|
$(YACC) --verbose -t -p VL --defines=parse.h -o $@ $<
|
||||||
parse.h: parse.cc
|
parse.h: parse.cc
|
||||||
mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
syn-rules.cc: $(srcdir)/syn-rules.y
|
syn-rules.cc: $(srcdir)/syn-rules.y
|
||||||
$(YACC) --verbose -t -p syn_ -o $@ $<
|
$(YACC) --verbose -t -p syn_ -o $@ $<
|
||||||
|
|
|
||||||
|
|
@ -89,10 +89,8 @@ fp_lex.cc: $(srcdir)/fp.lex
|
||||||
$(LEX) -s -ofp_lex.cc $(srcdir)/fp.lex
|
$(LEX) -s -ofp_lex.cc $(srcdir)/fp.lex
|
||||||
|
|
||||||
fp.cc: $(srcdir)/fp.y
|
fp.cc: $(srcdir)/fp.y
|
||||||
$(YACC) --verbose -t -p fp -d -o $@ $<
|
$(YACC) --verbose -t -p fp --defines=fp.h -o $@ $<
|
||||||
fp.h: fp.cc
|
fp.h: fp.cc
|
||||||
mv fp.cc.h $@ 2>/dev/null || mv fp.hh $@
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
ifeq (@WIN32@,yes)
|
ifeq (@WIN32@,yes)
|
||||||
TGTLDFLAGS=-L.. -livl
|
TGTLDFLAGS=-L.. -livl
|
||||||
|
|
|
||||||
|
|
@ -117,10 +117,8 @@ lexor.cc: $(srcdir)/lexor.lex
|
||||||
|
|
||||||
# Build this in two steps to avoid parallel build issues (see pr3462585)
|
# Build this in two steps to avoid parallel build issues (see pr3462585)
|
||||||
parse.cc: $(srcdir)/parse.y
|
parse.cc: $(srcdir)/parse.y
|
||||||
$(YACC) --verbose -t -d -o $@ $<
|
$(YACC) --verbose -t --defines=parse.h -o $@ $<
|
||||||
parse.h: parse.cc
|
parse.h: parse.cc
|
||||||
mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
lexor_keyword.o: lexor_keyword.cc parse.h
|
lexor_keyword.o: lexor_keyword.cc parse.h
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -142,10 +142,8 @@ tables.o: tables.cc
|
||||||
|
|
||||||
# Build this in two steps to avoid parallel build issues (see pr3462585)
|
# Build this in two steps to avoid parallel build issues (see pr3462585)
|
||||||
parse.cc: $(srcdir)/parse.y
|
parse.cc: $(srcdir)/parse.y
|
||||||
$(YACC) --verbose -t -d -o $@ $<
|
$(YACC) --verbose -t --defines=parse.h -o $@ $<
|
||||||
parse.h: parse.cc
|
parse.h: parse.cc
|
||||||
mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
lexor.cc: $(srcdir)/lexor.lex
|
lexor.cc: $(srcdir)/lexor.lex
|
||||||
$(LEX) -s -olexor.cc $(srcdir)/lexor.lex
|
$(LEX) -s -olexor.cc $(srcdir)/lexor.lex
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue