From aeb6856754f2969bb38be588e7c790091242aef4 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Tue, 22 Aug 2023 16:50:00 +0200 Subject: [PATCH] Use the C++ header file generated by bison instead of opting for a C header file --- modules/bindbackend/Makefile.am | 4 ---- pdns/Makefile.am | 10 +++------- pdns/bindlexer.l | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am index 58663f50b9..7906e2078c 100644 --- a/modules/bindbackend/Makefile.am +++ b/modules/bindbackend/Makefile.am @@ -19,7 +19,3 @@ libbindbackend_la_SOURCES = \ binddnssec.cc libbindbackend_la_LDFLAGS = -module -avoid-version - -# for bindparser.h/hh -.hh.h: - cp $< $@ diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 43a464f8ab..7b4436ef57 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -55,7 +55,7 @@ EXTRA_DIST = \ dnsmessage.proto \ mtasker.cc \ inflighter.cc \ - bindparser.h \ + bindparser.hh \ named.conf.parsertest \ pdns.service.in \ ixfrdist.service.in \ @@ -71,7 +71,7 @@ EXTRA_DIST = \ BUILT_SOURCES = \ bind-dnssec.schema.sqlite3.sql.h \ - bindparser.h \ + bindparser.hh \ dnslabeltext.cc \ apidocfiles.h @@ -1676,11 +1676,7 @@ dnslabeltext.cc: dnslabeltext.rl bind-dnssec.schema.sqlite3.sql.h: bind-dnssec.schema.sqlite3.sql ( echo '#pragma once'; echo 'static char sqlCreate[] __attribute__((unused))=' ; sed 's/$$/"/g' $< | sed 's/^/"/g' ; echo ';' ) > $@ -# for bindparser.h/hh -.hh.h: - cp $< $@ - -bindlexer.$(OBJEXT): bindparser.h +bindlexer.$(OBJEXT): bindparser.hh pdns_recursor rec_control: @echo "Please build the recursor from the recursordist/ dir" diff --git a/pdns/bindlexer.l b/pdns/bindlexer.l index 85cc0c6ef0..65dfc4da02 100644 --- a/pdns/bindlexer.l +++ b/pdns/bindlexer.l @@ -7,7 +7,7 @@ #define YY_NO_INPUT 1 #define YYSTYPE char * -#include "bindparser.h" +#include "bindparser.hh" int linenumber; #define MAX_INCLUDE_DEPTH 10 -- 2.47.2