make sanitation work when building into a separate build directory
directly from a CVS tree [RT #765]; also removed code for removing "#line" directives and the comment saying that the code for removing #line directives should be removed. :-)
This commit is contained in:
@@ -13,7 +13,7 @@
|
|||||||
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
||||||
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
# $Id: Makefile.in,v 1.27 2001/01/09 23:55:17 bwelling Exp $
|
# $Id: Makefile.in,v 1.28 2001/01/31 21:34:38 gson Exp $
|
||||||
|
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
@@ -50,30 +50,34 @@ TARGETS = ${OBJS}
|
|||||||
|
|
||||||
@BIND9_MAKE_RULES@
|
@BIND9_MAKE_RULES@
|
||||||
|
|
||||||
##confparser.c: confparser.y
|
#ifndef NOMINUM_PUBLIC
|
||||||
## ${YACC} -d ${srcdir}/confparser.y
|
## This rule is here only for Nominum internal use. The above "comment"
|
||||||
## rm -f confparser.c confparser_p.h
|
## will cause the sanitizer to remove it. The rule for building confparser.c
|
||||||
## mv y.tab.c confparser.c
|
## needs to be different from the release tree because the sanitized
|
||||||
## mv y.tab.h confparser_p.h
|
## confparser.y is in the object directory, not in ${srcdir}.
|
||||||
|
confparser.y: confparser.y.dirty
|
||||||
|
${PERL} ${top_srcdir}/util/sanitize.pl -iNOMINUM_PUBLIC - \
|
||||||
|
< ${srcdir}/confparser.y.dirty > confparser.y
|
||||||
|
|
||||||
## This rule is here during development to help debugging.
|
|
||||||
## Remove and uncomment the rule above before release.
|
|
||||||
confparser.c: confparser.y
|
confparser.c: confparser.y
|
||||||
${YACC} -d ${srcdir}/confparser.y
|
${YACC} -d confparser.y
|
||||||
rm -f confparser.c confparser_p.h
|
rm -f confparser.c confparser_p.h
|
||||||
sed -e '/^\# *line/d' -e 's/^\(char \* *yy.*\[\]\)/const \1/' \
|
sed -e 's/^\(char \* *yy.*\[\]\)/const \1/' \
|
||||||
-e 's/{ \(char \*t_name; int t_val; } yytoktype;\)/{ const \1/' \
|
-e 's/{ \(char \*t_name; int t_val; } yytoktype;\)/{ const \1/' \
|
||||||
< y.tab.c > confparser.c
|
< y.tab.c > confparser.c
|
||||||
rm -f y.tab.c
|
rm -f y.tab.c
|
||||||
chmod a-w confparser.c
|
chmod a-w confparser.c
|
||||||
mv y.tab.h confparser_p.h
|
mv y.tab.h confparser_p.h
|
||||||
|
#else
|
||||||
#ifndef NOMINUM_PUBLIC
|
#+confparser.c: confparser.y
|
||||||
## This rule is here only for Nominum internal use. The above "comment"
|
#+ ${YACC} -d ${srcdir}/confparser.y
|
||||||
## will cause the sanitizer to remove it
|
#+ rm -f confparser.c confparser_p.h
|
||||||
confparser.y: confparser.y.dirty
|
#+ sed -e 's/^\(char \* *yy.*\[\]\)/const \1/' \
|
||||||
${PERL} ../../../util/sanitize.pl -iNOMINUM_PUBLIC - \
|
#+ -e 's/{ \(char \*t_name; int t_val; } yytoktype;\)/{ const \1/' \
|
||||||
< confparser.y.dirty > confparser.y
|
#+ < y.tab.c > confparser.c
|
||||||
|
#+ rm -f y.tab.c
|
||||||
|
#+ chmod a-w confparser.c
|
||||||
|
#+ mv y.tab.h confparser_p.h
|
||||||
#endif NOMINUM_PUBLIC
|
#endif NOMINUM_PUBLIC
|
||||||
|
|
||||||
depend: confparser.c
|
depend: confparser.c
|
||||||
|
|||||||
Reference in New Issue
Block a user