From 63069342730b87b3c5094f1d9400d4edbc6bb831 Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Tue, 4 Nov 2003 00:25:49 +0000 Subject: [PATCH] Makefile.in (cpp.dvi): New target split from cpp.info. 2003-11-03 Kelley Cook * Makefile.in (cpp.dvi): New target split from cpp.info. (gcc.dvi): New target split from gcc.info. (gccint.dvi): New target split from gccint.info. (cppinternals.dvi): New target split from cppinternals.info (gccinstall.info): New specific rule. (gccinstall.dvi): Likewise. (dvi): Move targets to $(docobjdir). ($(docobjdir)/%.dvi): New implicit rule. ada/ 2003-11-03 Kelley Cook * Make-lang.in (dvi): Move targets to $(docobjdir). (gnat_ug_vms.dvi): Simplify rule and adjust target. (gnat_ug_wnt.dvi): Likewise. (gnat_ug_unx.dvi): Likewise. (gnat_ug_vxw.dvi): Likewise. (gnat_rm.dvi): Likewise. (gnat-style.dvi): Likewise. f/ 2003-11-03 Kelley Cook * Make-lang.in (dvi): Move targets to $(docobjdir). (g77.dvi): Simplify rule. (g77.info): Sinplify rule. (g77.1): Delete. (g77.pod): New intermediate rule. java/ 2003-11-03 Kelley Cook * Make-lang.in (dvi): Move targets to $(docobjdir). (gcj.dvi): Simplify rule and adjust target. (gcj.info): Simplify rule. (gcj.pod): New intermediate rule. (gcjh.pod): Likewise. (jv-scan.pod): Likewise. (jcf-dump.pod): Likewise. (gij.pod): Likewise. (jv-convert.pod): Likewise. (rmic.pod): Likewise. (rmiregistry.pod): Likewise. (gcj.1): Delete. (gcjh.1): Delete. (jv-scan.1): Delete. (jcf-dump.1): Delete. (gij.1): Delete. (jv-convert.1): Delete. (rmic.1): Delete. (rmiregistry.1): Delete. treelang/ 2003-11-03 Kelley Cook * Make-lang.in (dvi): Move targets to $(docobjdir). (treelang.dvi): Simplify rule and adjust target. (treelang.info): Simplify rule. (parse.o): Correct dependencies. (TREE_EXE): Delete doubled suffix append. From-SVN: r73238 --- gcc/ChangeLog | 11 +++++ gcc/Makefile.in | 35 ++++++++++----- gcc/ada/ChangeLog | 10 +++++ gcc/ada/Make-lang.in | 53 ++++++++++++----------- gcc/f/ChangeLog | 8 ++++ gcc/f/Make-lang.in | 21 ++++----- gcc/java/ChangeLog | 22 ++++++++++ gcc/java/Make-lang.in | 89 ++++++++++++--------------------------- gcc/treelang/ChangeLog | 8 ++++ gcc/treelang/Make-lang.in | 23 +++++----- 10 files changed, 155 insertions(+), 125 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 268ed0c136a3..f6b93a7d1a82 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2003-11-03 Kelley Cook + + * Makefile.in (cpp.dvi): New target split from cpp.info. + (gcc.dvi): New target split from gcc.info. + (gccint.dvi): New target split from gccint.info. + (cppinternals.dvi): New target split from cppinternals.info + (gccinstall.info): New specific rule. + (gccinstall.dvi): Likewise. + (dvi): Move targets to $(docobjdir). + ($(docobjdir)/%.dvi): New implicit rule. + 2003-11-03 Richard Kenner * doc/gty.texi (tag, desc): Say more about role of desc values in diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 1ef581b29e64..62783337e9c4 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2671,11 +2671,10 @@ TEXI_CPPINT_FILES = cppinternals.texi # patterns. To use them, put each of the specific target with with their # specific dependencies but no build commands. -$(docobjdir)/cpp.info cpp.dvi: $(TEXI_CPP_FILES) -$(docobjdir)/gcc.info gcc.dvi: $(TEXI_GCC_FILES) -$(docobjdir)/gccint.info gccint.dvi: $(TEXI_GCCINT_FILES) -$(docobjdir)/gccinstall.info gccinstall.dvi: $(TEXI_GCCINSTALL_FILES) -$(docobjdir)/cppinternals.info cppinternals.dvi: $(TEXI_CPPINT_FILES) +$(docobjdir)/cpp.info: $(TEXI_CPP_FILES) +$(docobjdir)/gcc.info: $(TEXI_GCC_FILES) +$(docobjdir)/gccint.info: $(TEXI_GCCINT_FILES) +$(docobjdir)/cppinternals.info: $(TEXI_CPPINT_FILES) $(docobjdir)/%.info: %.texi stmp-docobjdir if [ x$(BUILD_INFO) = xinfo ]; then \ @@ -2683,14 +2682,28 @@ $(docobjdir)/%.info: %.texi stmp-docobjdir -I $(docdir)/include -o $@ $<; \ fi -dvi:: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi cppinternals.dvi +# Duplicate entry to handle renaming of gccinstall.info +$(docobjdir)/gccinstall.info: $(TEXI_GCCINSTALL_FILES) stmp-docobjdir + if [ x$(BUILD_INFO) = xinfo ]; then \ + $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) \ + -I $(docdir)/include -o $@ $<; \ + fi -%.dvi: %.texi stmp-docobjdir - $(TEXI2DVI) -I $(docdir) -I $(docdir)/include $< +$(docobjdir)/cpp.dvi: $(TEXI_CPP_FILES) +$(docobjdir)/gcc.dvi: $(TEXI_GCC_FILES) +$(docobjdir)/gccint.dvi: $(TEXI_GCCINT_FILES) +$(docobjdir)/cppinternals.dvi: $(TEXI_CPPINT_FILES) -gccinstall.dvi: - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(TEXI2DVI) -I $$s/doc -I $$s/doc/include -o $@ $$s/doc/install.texi +dvi:: $(docobjdir)/gcc.dvi $(docobjdir)/gccint.dvi \ + $(docobjdir)/gccinstall.dvi $(docobjdir)/cpp.dvi \ + $(docobjdir)/cppinternals.dvi + +$(docobjdir)/%.dvi: %.texi stmp-docobjdir + $(TEXI2DVI) -I $(docdir) -I $(docdir)/include -o $@ $< + +# Duplicate entry to handle renaming of gccinstall.dvi +$(docobjdir)/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES) stmp-docobjdir + $(TEXI2DVI) -I $(docdir) -I $(docdir)/include -o $@ $< generated-manpages:: $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 \ $(docobjdir)/gcc.1 $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7 \ diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index e1cd2b4b9ea4..1d33b4adf1e3 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2003-11-03 Kelley Cook + + * Make-lang.in (dvi): Move targets to $(docobjdir). + (gnat_ug_vms.dvi): Simplify rule and adjust target. + (gnat_ug_wnt.dvi): Likewise. + (gnat_ug_unx.dvi): Likewise. + (gnat_ug_vxw.dvi): Likewise. + (gnat_rm.dvi): Likewise. + (gnat-style.dvi): Likewise. + 2003-10-31 Kelley Cook * gigi.h: Missed commit from update for C90. diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index b720bbb77c32..d9c446960119 100644 --- a/gcc/ada/Make-lang.in +++ b/gcc/ada/Make-lang.in @@ -506,39 +506,38 @@ install-info:: $(DESTDIR)$(infodir)/gnat_ug_vms.info \ $(DESTDIR)$(infodir)/gnat_rm.info \ $(DESTDIR)$(infodir)/gnat-style.info -ada/gnat_ug_unx.dvi : $(srcdir)/ada/gnat_ug_unx.texi \ - $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi - s=`cd $(srcdir); ${PWD_COMMAND}`; \ - cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_unx.dvi $$s/ada/gnat_ug_unx.texi +dvi:: $(docobjdir)/gnat_ug_vms.dvi $(docobjdir)/gnat_ug_wnt.dvi \ + $(docobjdir)/gnat_ug_unx.dvi $(docobjdir)/gnat_ug_vxw.dvi \ + $(docobjdir)/gnat_rm.dvi $(docobjdir)/gnat-style.dvi -ada/gnat_ug_vms.dvi : $(srcdir)/ada/gnat_ug_vms.texi \ - $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi - s=`cd $(srcdir); ${PWD_COMMAND}`; \ - cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vms.dvi $$s/ada/gnat_ug_vms.texi +$(docobjdir)/gnat_ug_unx.dvi: ada/gnat_ug_unx.texi \ + $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \ + stmp-docobjdir + $(TEXI2DVI) -c -I $(docdir)/include -o $@ $< -ada/gnat_ug_vxw.dvi : $(srcdir)/ada/gnat_ug_vxw.texi \ - $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi - s=`cd $(srcdir); ${PWD_COMMAND}`; \ - cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vxw.dvi $$s/ada/gnat_ug_vxw.texi +$(docobjdir)/gnat_ug_vms.dvi: ada/gnat_ug_vms.texi \ + $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \ + stmp-docobjdir + $(TEXI2DVI) -c -I $(docdir)/include -o $@ $< -ada/gnat_ug_wnt.dvi : $(srcdir)/ada/gnat_ug_wnt.texi \ - $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi - s=`cd $(srcdir); ${PWD_COMMAND}`; \ - cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_wnt.dvi $$s/ada/gnat_ug_wnt.texi +$(docobjdir)/gnat_ug_vxw.dvi: ada/gnat_ug_vxw.texi \ + $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \ + stmp-docobjdir + $(TEXI2DVI) -c -I $(docdir)/include -o $@ $< -ada/gnat_rm.dvi : $(srcdir)/ada/gnat_rm.texi \ - $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi - s=`cd $(srcdir); ${PWD_COMMAND}`; \ - cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_rm.dvi $$s/ada/gnat_rm.texi +$(docobjdir)/gnat_ug_wnt.dvi: ada/gnat_ug_wnt.texi \ + $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \ + stmp-docobjdir + $(TEXI2DVI) -c -I $(docdir)/include -o $@ $< -ada/gnat-style.dvi : $(srcdir)/ada/gnat-style.texi \ - $(srcdir)/doc/include/fdl.texi - s=`cd $(srcdir); ${PWD_COMMAND}`; \ - cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat-style.dvi $$s/ada/gnat-style.texi +$(docobjdir)/gnat_rm.dvi: ada/gnat_rm.texi \ + $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \ + stmp-docobjdir + $(TEXI2DVI) -c -I $(docdir)/include -o $@ $< -dvi:: ada/gnat_ug_vms.dvi ada/gnat_ug_wnt.dvi \ - ada/gnat_ug_unx.dvi ada/gnat_ug_vxw.dvi \ - ada/gnat_rm.dvi ada/gnat-style.dvi +$(docobjdir)/gnat-style.dvi: ada/gnat-style.texi $(docdir)/include/fdl.texi \ + stmp-docobjdir + $(TEXI2DVI) -c -I $(docdir)/include -o $@ $< # Install hooks: diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index fe7ed0516e0b..5fbb05b08630 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,11 @@ +2003-11-03 Kelley Cook + + * Make-lang.in (dvi): Move targets to $(docobjdir). + (g77.dvi): Simplify rule. + (g77.info): Sinplify rule. + (g77.1): Delete. + (g77.pod): New intermediate rule. + 2003-10-31 Jakub Jelinek * com.c (ffecom_sym_transform_): Set tree type of offset diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index a5256c893c3e..8c458df28f35 100644 --- a/gcc/f/Make-lang.in +++ b/gcc/f/Make-lang.in @@ -149,7 +149,7 @@ f77.tags: force cd $(srcdir)/f; etags *.c *.h info:: $(docobjdir)/g77.info -dvi:: f/g77.dvi +dvi:: $(docobjdir)/g77.dvi generated-manpages:: $(docobjdir)/g77.1 # g77 documentation. @@ -163,25 +163,22 @@ $(docobjdir)/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ stmp-docobjdir if [ x$(BUILD_INFO) = xinfo ]; then \ rm -f $(@)*; \ - cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o $@ g77.texi; \ + $(MAKEINFO) -I$(docdir)/include -I$(srcdir)/f -o $@ $<; \ else true; fi -f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ +$(docobjdir)/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ $(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \ $(srcdir)/f/news.texi $(srcdir)/f/intdoc.texi \ $(srcdir)/f/root.texi $(docdir)/include/fdl.texi \ $(docdir)/include/gpl.texi \ $(docdir)/include/funding.texi \ - $(docdir)/include/gcc-common.texi - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - cd f && $(TEXI2DVI) -I $$s/doc/include $$s/f/g77.texi + $(docdir)/include/gcc-common.texi \ + stmp-docobjdir + $(TEXI2DVI) -I $(srcdir)/f -I $(docdir)/include -o $@ $< -$(docobjdir)/g77.1: $(srcdir)/f/invoke.texi - -$(TEXI2POD) < $(srcdir)/f/invoke.texi > f/g77.pod; \ - ($(POD2MAN) --section=1 f/g77.pod > f/g77.1.T$$$$ && \ - mv -f f/g77.1.T$$$$ $(docobjdir)/g77.1) || \ - (rm -f f/g77.1.T$$$$ && exit 1); \ - rm -f f/g77.pod; \ +.INTERMEDIATE: g77.pod +g77.pod: f/invoke.texi + -$(TEXI2POD) < $< > $@ # This dance is all about producing accurate documentation for g77's # intrinsics with minimum fuss. f/ansify appends "\n\" to C strings diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index fa42410e1371..a1e76ce335e0 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,25 @@ +2003-11-03 Kelley Cook + + * Make-lang.in (dvi): Move targets to $(docobjdir). + (gcj.dvi): Simplify rule and adjust target. + (gcj.info): Simplify rule. + (gcj.pod): New intermediate rule. + (gcjh.pod): Likewise. + (jv-scan.pod): Likewise. + (jcf-dump.pod): Likewise. + (gij.pod): Likewise. + (jv-convert.pod): Likewise. + (rmic.pod): Likewise. + (rmiregistry.pod): Likewise. + (gcj.1): Delete. + (gcjh.1): Delete. + (jv-scan.1): Delete. + (jcf-dump.1): Delete. + (gij.1): Delete. + (jv-convert.1): Delete. + (rmic.1): Delete. + (rmiregistry.1): Delete. + 2003-11-02 Jeff Sturm Fixes PR java/12866. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index ab732310960c..6388a53b52e6 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -161,7 +161,7 @@ java.tags: force cd $(srcdir)/java; etags *.y *.c *.h --language=none --regex='/DEFTREECODE [(]\([A-Z_]+\)/\1/' java-tree.def info:: $(docobjdir)/gcj.info -dvi:: java/gcj.dvi +dvi:: $(docobjdir)/gcj.dvi generated-manpages:: $(docobjdir)/gcj.1 $(docobjdir)/gcjh.1 \ $(docobjdir)/jv-scan.1 $(docobjdir)/jcf-dump.1 \ $(docobjdir)/gij.1 $(docobjdir)/jv-convert.1 \ @@ -354,74 +354,37 @@ java/java-tree-inline.o: tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(srcdir)/tree-inline.c -o $@ # Documentation -$(docobjdir)/gcj.info: $(srcdir)/java/gcj.texi $(docdir)/include/fdl.texi \ +$(docobjdir)/gcj.info: java/gcj.texi $(docdir)/include/fdl.texi \ $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi stmp-docobjdir if test "x$(BUILD_INFO)" = xinfo; then \ - rm -f $(docobjdir)/gcj.info*; \ - $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include \ - -o $(docobjdir)/gcj.info $(srcdir)/java/gcj.texi; \ + rm -f doc/gcj.info*; \ + $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include -o $@ $<; \ else true; fi -java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/include/fdl.texi \ - $(srcdir)/doc/include/gpl.texi $(srcdir)/doc/include/gcc-common.texi - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - cd java && $(TEXI2DVI) -I $$s/doc/include $$s/java/gcj.texi +$(docobjdir)/gcj.dvi: java/gcj.texi $(docdir)/include/fdl.texi \ + $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi \ + stmp-docobjdir + $(TEXI2DVI) -I $(docdir)/include -o $@ $< -$(docobjdir)/gcj.1: $(srcdir)/java/gcj.texi stmp-docobjdir - -$(TEXI2POD) -D gcj < $(srcdir)/java/gcj.texi > java/gcj.pod - -($(POD2MAN) --section=1 java/gcj.pod > java/gcj.1.T$$$$ && \ - mv -f java/gcj.1.T$$$$ $(docobjdir)/gcj.1) || \ - (rm -f java/gcj.1.T$$$$ && exit 1) - -rm -f java/gcj.pod +.INTERMEDIATE: gcj.pod gcjh.pod jv-scan.pod jcf-dump.pod gij.pod \ + jv-convert.pod rmic.pod rmiregistry.pod -$(docobjdir)/gcjh.1: $(srcdir)/java/gcj.texi stmp-docobjdir - -$(TEXI2POD) -D gcjh < $(srcdir)/java/gcj.texi > java/gcjh.pod - -($(POD2MAN) --section=1 java/gcjh.pod > java/gcjh.1.T$$$$ && \ - mv -f java/gcjh.1.T$$$$ $(docobjdir)/gcjh.1) || \ - (rm -f java/gcjh.1.T$$$$ && exit 1) - -rm -f java/gcjh.pod - -$(docobjdir)/jv-scan.1: $(srcdir)/java/gcj.texi stmp-docobjdir - -$(TEXI2POD) -D jv-scan < $(srcdir)/java/gcj.texi > java/jv-scan.pod - -($(POD2MAN) --section=1 java/jv-scan.pod > java/jv-scan.1.T$$$$ && \ - mv -f java/jv-scan.1.T$$$$ $(docobjdir)/jv-scan.1) || \ - (rm -f java/jv-scan.1.T$$$$ && exit 1) - -rm -f java/jv-scan.pod - -$(docobjdir)/jcf-dump.1: $(srcdir)/java/gcj.texi stmp-docobjdir - -$(TEXI2POD) -D jcf-dump < $(srcdir)/java/gcj.texi > java/jcf-dump.pod - -($(POD2MAN) --section=1 java/jcf-dump.pod > java/jcf-dump.1.T$$$$ && \ - mv -f java/jcf-dump.1.T$$$$ $(docobjdir)/jcf-dump.1) || \ - (rm -f java/jcf-dump.1.T$$$$ && exit 1) - -rm -f java/jcf-dump.pod - -$(docobjdir)/gij.1: $(srcdir)/java/gcj.texi stmp-docobjdir - -$(TEXI2POD) -D gij < $(srcdir)/java/gcj.texi > java/gij.pod - -($(POD2MAN) --section=1 java/gij.pod > java/gij.1.T$$$$ && \ - mv -f java/gij.1.T$$$$ $(docobjdir)/gij.1) || \ - (rm -f java/gij.1.T$$$$ && exit 1) - -rm -f java/gij.pod - -$(docobjdir)/jv-convert.1: $(srcdir)/java/gcj.texi stmp-docobjdir - -$(TEXI2POD) -D jv-convert < $(srcdir)/java/gcj.texi > java/jv-convert.pod - -($(POD2MAN) --section=1 java/jv-convert.pod > java/jv-convert.1.T$$$$ && \ - mv -f java/jv-convert.1.T$$$$ $(docobjdir)/jv-convert.1) || \ - (rm -f java/jv-convert.1.T$$$$ && exit 1) - -rm -f java/jv-convert.pod - -$(docobjdir)/rmic.1: $(srcdir)/java/gcj.texi stmp-docobjdir - -$(TEXI2POD) -D rmic < $(srcdir)/java/gcj.texi > java/rmic.pod - -($(POD2MAN) --section=1 java/rmic.pod > java/rmic.1.T$$$$ && \ - mv -f java/rmic.1.T$$$$ $(docobjdir)/rmic.1) || \ - (rm -f java/rmic.1.T$$$$ && exit 1) - -rm -f java/rmic.pod - -$(docobjdir)/rmiregistry.1: $(srcdir)/java/gcj.texi stmp-docobjdir - -$(TEXI2POD) -D rmiregistry < $(srcdir)/java/gcj.texi > java/rmiregistry.pod - -($(POD2MAN) --section=1 java/rmiregistry.pod > java/rmiregistry.1.T$$$$ && \ - mv -f java/rmiregistry.1.T$$$$ $(docobjdir)/rmiregistry.1) || \ - (rm -f java/rmiregistry.1.T$$$$ && exit 1) - -rm -f java/rmiregistry.pod +gcj.pod: java/gcj.texi + -$(TEXI2POD) -D gcj < $< > $@ +gcjh.pod: java/gcj.texi + -$(TEXI2POD) -D gcjh < $< > $@ +jv-scan.pod: java/gcj.texi + -$(TEXI2POD) -D jv-scan < $< > $@ +jcf-dump.pod: java/gcj.texi + -$(TEXI2POD) -D jcf-dump < $< > $@ +gij.pod: java/gcj.texi + -$(TEXI2POD) -D gij < $< > $@ +jv-convert.pod: java/gcj.texi + -$(TEXI2POD) -D jv-convert < $< > $@ +rmic.pod: java/gcj.texi + -$(TEXI2POD) -D rmic < $< > $@ +rmiregistry.pod: java/gcj.texi + -$(TEXI2POD) -D rmiregistry < $< > $@ # Install the man pages. java.install-man: installdirs $(GENERATED_JAVA_MANPAGES) diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog index 43f7c4dcac88..5168cb28fafd 100644 --- a/gcc/treelang/ChangeLog +++ b/gcc/treelang/ChangeLog @@ -1,3 +1,11 @@ +2003-11-03 Kelley Cook + + * Make-lang.in (dvi): Move targets to $(docobjdir). + (treelang.dvi): Simplify rule and adjust target. + (treelang.info): Simplify rule. + (parse.o): Correct dependencies. + (TREE_EXE): Delete doubled suffix append. + 2003-10-21 Kelley Cook * Make-lang.in (treelang.o): Depend on $(parsedir)/treelang/parse.h. diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in index a18ad56644da..e94ac7f6047c 100644 --- a/gcc/treelang/Make-lang.in +++ b/gcc/treelang/Make-lang.in @@ -61,7 +61,7 @@ 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) +TREE_EXES = tree1 #no -Wtraditional warnings, allow long long treelang-warn = $(LOOSE_WARN) -pedantic -Wno-long-long -Wmissing-prototypes -Wmissing-declarations $(WERROR) @@ -109,9 +109,9 @@ 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: $(parsedir)/treelang/parse.h $(parsedir)/treelang/parse.c \ - $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) diagnostic.h treelang/treelang.h \ - input.h +treelang/parse.o: $(parsedir)/treelang/parse.c $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h $(TM_H) diagnostic.h treelang/treelang.h input.h \ + treelang/treetree.h $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $(parsedir)/treelang/parse.c $(OUTPUT_OPTION) @@ -149,25 +149,24 @@ treelang.rest.encap: treelang.tags: force cd $(srcdir)/treelang; etags *.y *.l *.c *.h -.phony:treelang.info info:: $(docobjdir)/treelang.info +dvi:: $(docobjdir)/treelang.dvi -$(docobjdir)/treelang.info: $(srcdir)/treelang/treelang.texi \ +$(docobjdir)/treelang.info: treelang/treelang.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 + $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include -o $@ $< -dvi:: $(srcdir)/treelang/treelang.texi \ +$(docobjdir)/treelang.dvi: treelang/treelang.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 + $(docdir)/include/funding.texi \ + stmp-docobjdir + $(TEXI2DVI) -I $(docdir)/include -o $@ $< # # Install hooks: