Make-lang.in (parse.o): Honor $(parsedir).

* Make-lang.in (parse.o): Honor $(parsedir).
	(lex.o): Likewise.
	(lex.c): Likewise
	(parse.c, parse.h): Likewise.
	($(docobjdir)/treelang.info): Replace $(srcdir)/doc with $(docdir).
	(dvi): Likewise.

From-SVN: r72778
This commit is contained in:
Kelley Cook 2003-10-21 23:58:31 +00:00 committed by R. Kelley Cook
parent c599a7afea
commit 890c2f2b1c
2 changed files with 32 additions and 18 deletions

View File

@ -1,3 +1,12 @@
2003-10-21 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (parse.o): Honor $(parsedir).
(lex.o): Likewise.
(lex.c): Likewise
(parse.c, parse.h): Likewise.
($(docobjdir)/treelang.info): Replace $(srcdir)/doc with $(docdir).
(dvi): Likewise.
2003-10-20 Mark Mitchell <mark@codesourcery.com>
* Make-lang.in ($(docobjdir)/treelang/treelang.info): Depend on

View File

@ -57,9 +57,9 @@ GCC_EXTRAS = -B./ -B$(build_tooldir)/bin/ -isystem $(build_tooldir)/include
# GCC_FOR_TREELANG = ./xgcc $(GCC_EXTRAS)
TREE_GENERATED = $(srcdir)/treelang/lex.c $(srcdir)/treelang/parse.c \
$(srcdir)/treelang/parse.h $(srcdir)/treelang/parse.output \
$(srcdir)/treelang/TAGS
TREE_GENERATED = $(parsedir)/treelang/lex.c $(parsedir)/treelang/parse.c \
$(parsedir)/treelang/parse.h $(parsedir)/treelang/parse.output \
$(parsedir)/treelang/TAGS
TREE_EXES = tree1$(exeext)
@ -109,22 +109,27 @@ treelang/treetree.o: treelang/treetree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
treelang/tree-convert.o: treelang/tree-convert.c $(CONFIG_H) $(SYSTEM_H) \
coretypes.h diagnostic.h $(TREE_H) flags.h toplev.h langhooks.h $(TM_H)
treelang/parse.o: treelang/parse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
$(TM_H) diagnostic.h treelang/treelang.h input.h treelang/treetree.h
treelang/parse.o: $(parsedir)/treelang/parse.h $(parsedir)/treelang/parse.c \
$(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) diagnostic.h treelang/treelang.h \
input.h
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(parsedir)/treelang/parse.c $(OUTPUT_OPTION)
treelang/lex.o: treelang/lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
treelang/lex.o: $(parsedir)/treelang/lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
$(TM_H) diagnostic.h $(TREE_H) treelang/treelang.h input.h treelang/parse.h
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(parsedir)/treelang/lex.c $(OUTPUT_OPTION)
# generated files the files from lex and yacc are put into the source
# directory in case someone wants to build but does not have
# lex/yacc
$(srcdir)/treelang/lex.c: $(srcdir)/treelang/lex.l
$(LEX) $(LEXFLAGS) -o$(srcdir)/treelang/lex.c $(srcdir)/treelang/lex.l
$(parsedir)/treelang/lex.c: $(srcdir)/treelang/lex.l
$(LEX) $(LEXFLAGS) -o$(parsedir)/treelang/lex.c $(srcdir)/treelang/lex.l
$(srcdir)/treelang/parse.c $(srcdir)/treelang/parse.h: $(srcdir)/treelang/parse.y
$(parsedir)/treelang/parse.c $(parsedir)/treelang/parse.h: $(srcdir)/treelang/parse.y
$(BISON) $(BISONFLAGS) -v --defines \
--output=$(srcdir)/treelang/parse.c $(srcdir)/treelang/parse.y
--output=$(parsedir)/treelang/parse.c $(srcdir)/treelang/parse.y
# -v
@ -147,19 +152,19 @@ treelang.tags: force
info:: $(docobjdir)/treelang.info
$(docobjdir)/treelang.info: $(srcdir)/treelang/treelang.texi \
$(srcdir)/doc/include/gcc-common.texi \
$(srcdir)/doc/include/gpl.texi \
$(srcdir)/doc/include/fdl.texi \
$(srcdir)/doc/include/funding.texi \
$(docdir)/include/gcc-common.texi \
$(docdir)/include/gpl.texi \
$(docdir)/include/fdl.texi \
$(docdir)/include/funding.texi \
stmp-docobjdir
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc/include \
-o $@ treelang/treelang.texi
dvi:: $(srcdir)/treelang/treelang.texi \
$(srcdir)/doc/include/gcc-common.texi \
$(srcdir)/doc/include/gpl.texi \
$(srcdir)/doc/include/fdl.texi \
$(srcdir)/doc/include/funding.texi
$(docdir)/include/gcc-common.texi \
$(docdir)/include/gpl.texi \
$(docdir)/include/fdl.texi \
$(docdir)/include/funding.texi
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
cd treelang && $(TEXI2DVI) -I $$s/doc/include $$s/treelang/treelang.texi