Make-lang.in (info): Honor $(parsedir) and $(docobjdir).

2003-10-20  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (info): Honor $(parsedir) and $(docobjdir).
	(generate-manpages): Likewise.
	(java.maintainer-clean): Likewise.
	(gcj.info): Likewise.
	(gcj.1): Likewise.
	(gcjh.1): Likewise.
	(jv-scan.1): Likewise.
	(jcf-dump.1): Likewise.
	(gij.1): Likewise.
	(jv-convert.1): Likewise.
	(rmic.1): Likewise.
	(rmiregistry.1): Likewise.
	(java.install-man): Likewise.
	(parse-scan.o): Move and define complete compile line.
	(parse.o): Likewise.
	(jcf-tree-inline.o): Move.

From-SVN: r72739

2 files changed, 81 insertions, 53 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 57109df..326e8e8 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,22 @@
+2003-10-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* Make-lang.in (info): Honor $(parsedir) and $(docobjdir).
+	(generate-manpages): Likewise.
+	(java.maintainer-clean): Likewise.
+	(gcj.info): Likewise.
+	(gcj.1): Likewise.
+	(gcjh.1): Likewise.
+	(jv-scan.1): Likewise.
+	(jcf-dump.1): Likewise.
+	(gij.1): Likewise.
+	(jv-convert.1): Likewise.
+	(rmic.1): Likewise.
+	(rmiregistry.1): Likewise.
+	(java.install-man): Likewise.
+	(parse-scan.o): Move and define complete compile line.
+	(parse.o): Likewise.
+	(jcf-tree-inline.o): Move.
+
 2003-10-20  Mark Mitchell  <mark@codesourcery.com>
 
 	* Make-lang.in (info): Update dependencies.
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 7b9a39d..ab73231 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -162,10 +162,10 @@ java.tags: force
 
 info:: $(docobjdir)/gcj.info
 dvi:: java/gcj.dvi
-generated-manpages:: $(srcdir)/java/gcj.1 $(srcdir)/java/gcjh.1 \
-	$(srcdir)/java/jv-scan.1 $(srcdir)/java/jcf-dump.1 \
-	$(srcdir)/java/gij.1 $(srcdir)/java/jv-convert.1 \
-	$(srcdir)/java/rmic.1 $(srcdir)/java/rmiregistry.1
+generated-manpages:: $(docobjdir)/gcj.1 $(docobjdir)/gcjh.1 \
+	$(docobjdir)/jv-scan.1 $(docobjdir)/jcf-dump.1 \
+	$(docobjdir)/gij.1 $(docobjdir)/jv-convert.1 \
+	$(docobjdir)/rmic.1 $(docobjdir)/rmiregistry.1
 
 # Install hooks:
 # jc1, gcj, jvgenmain, and gcjh are installed elsewhere as part
@@ -229,12 +229,12 @@ java.distclean:
 java.extraclean:
 java.maintainer-clean:
 	-rm -f $(parsedir)/java/parse.c $(parsedir)/java/parse-scan.c java/parse.output java/y.tab.c
-	-rm -f $(srcdir)/java/gcj.1 $(srcdir)/java/gcjh.1
-	-rm -f $(srcdir)/java/jv-scan.1 $(srcdir)/java/jcf-dump.1
-	-rm -f $(srcdir)/java/gij.1
-	-rm -f $(srcdir)/java/jv-convert.1
-	-rm -f $(srcdir)/java/rmic.1
-	-rm -f $(srcdir)/java/rmiregistry.1
+	-rm -f $(docobjdir)/gcj.1 $(docobjdir)/gcjh.1
+	-rm -f $(docobjdir)/jv-scan.1 $(docobjdir)/jcf-dump.1
+	-rm -f $(docobjdir)/gij.1
+	-rm -f $(docobjdir)/jv-convert.1
+	-rm -f $(docobjdir)/rmic.1
+	-rm -f $(docobjdir)/rmiregistry.1
 #
 # Stage hooks:
 # The main makefile has already created stage?/java.
@@ -257,9 +257,6 @@ java.stagefeedback: stageprofile-start
 JAVA_TREE_H = $(TREE_H) $(HASHTAB_H) java/java-tree.h java/java-tree.def
 JAVA_LEX_C = java/lex.c java/keyword.h java/chartables.h
 
-java/parse.o: $(parsedir)/java/parse.c java/jcf-reader.c $(CONFIG_H) $(SYSTEM_H) \
-  coretypes.h $(TM_H) function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h \
-  java/lex.h input.h $(GGC_H) debug.h gt-java-parse.h gtype-java.h
 java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
   java/jcf-dump.c java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def \
   version.h $(GGC_H)
@@ -288,13 +285,6 @@ java/expr.o: java/expr.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h real.h \
   $(RTL_H) $(EXPR_H) java/javaop.h java/java-opcodes.h except.h \
   java/java-except.h java/java-except.h java/parse.h toplev.h \
   $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) gt-java-expr.h
-java/java-tree-inline.o: tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   $(TM_H) $(TREE_H) $(RTL_H) expr.h flags.h params.h input.h insn-config.h \
-   $(INTEGRATE_H) $(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) toplev.h \
-   langhooks.h $(C_COMMON_H) $(srcdir)/tree-inline.h
-	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-	-DINLINER_FOR_JAVA=1 \
-	$(srcdir)/tree-inline.c -o $@
 java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
   $(TM_H) java/jcf.h
 java/jcf-parse.o: java/jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) flags.h \
@@ -314,8 +304,6 @@ java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_H) \
   coretypes.h $(TM_H) toplev.h $(GGC_H) gt-java-mangle.h
 java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \
   $(SYSTEM_H) coretypes.h $(TM_H) toplev.h $(GGC_H)
-java/parse-scan.o: $(parsedir)/java/parse-scan.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h \
-  $(JAVA_LEX_C) java/parse.h java/lex.h input.h
 java/resource.o: java/resource.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \
   $(TARGET_H) function.h gt-java-resource.h expr.h
@@ -330,6 +318,18 @@ java/xref.o: java/xref.c java/xref.h $(CONFIG_H) $(JAVA_TREE_H) toplev.h \
 java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   java/zipfile.h
 
+# parse-scan.o and parse.o compiled from $(parsedir)/java
+java/parse-scan.o: $(parsedir)/java/parse-scan.c $(CONFIG_H) $(SYSTEM_H) \
+  coretypes.h $(TM_H) toplev.h $(JAVA_LEX_C) java/parse.h java/lex.h input.h
+	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+		$(parsedir)/java/parse-scan.c $(OUTPUT_OPTION)
+
+java/parse.o: $(parsedir)/java/parse.c java/jcf-reader.c $(CONFIG_H) $(SYSTEM_H) \
+  coretypes.h $(TM_H) function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h \
+  java/lex.h input.h $(GGC_H) debug.h gt-java-parse.h gtype-java.h
+	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+		$(parsedir)/java/parse.c $(OUTPUT_OPTION)
+
 # jcf-io.o needs $(ZLIBINC) added to cflags.
 java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(JAVA_TREE_H)
@@ -338,19 +338,28 @@ java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 
 # jcf-path.o needs a -D.
 java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   java/jcf.h
+  java/jcf.h
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	  -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \
 	  -DDEFAULT_TARGET_VERSION=\"$(version)\" \
 	  $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
 
+# jcf-tree-inline.o needs a -D.
+java/java-tree-inline.o: tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+  $(TM_H) $(TREE_H) $(RTL_H) expr.h flags.h params.h input.h insn-config.h \
+  $(INTEGRATE_H) $(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) toplev.h \
+  langhooks.h $(C_COMMON_H) $(srcdir)/tree-inline.h
+	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+	-DINLINER_FOR_JAVA=1 \
+	$(srcdir)/tree-inline.c -o $@
+
 # Documentation
-$(docobjdir)/gcj.info: $(srcdir)/java/gcj.texi \
-	 $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi \
-	 $(srcdir)/doc/include/gcc-common.texi
+$(docobjdir)/gcj.info: $(srcdir)/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 $(@)*; \
-	  cd $(srcdir)/java && $(MAKEINFO) -I../doc/include -o $@ gcj.texi; \
+	  rm -f $(docobjdir)/gcj.info*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include \
+	  -o $(docobjdir)/gcj.info $(srcdir)/java/gcj.texi; \
 	else true; fi
 
 java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/include/fdl.texi \
@@ -358,59 +367,59 @@ java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/include/fdl.texi \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	cd java && $(TEXI2DVI) -I $$s/doc/include $$s/java/gcj.texi
 
-$(srcdir)/java/gcj.1: $(srcdir)/java/gcj.texi
+$(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$$$$ $(srcdir)/java/gcj.1) || \
+		mv -f java/gcj.1.T$$$$ $(docobjdir)/gcj.1) || \
 		(rm -f java/gcj.1.T$$$$ && exit 1)
 	-rm -f java/gcj.pod
 
-$(srcdir)/java/gcjh.1: $(srcdir)/java/gcj.texi
+$(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$$$$ $(srcdir)/java/gcjh.1) || \
+		mv -f java/gcjh.1.T$$$$ $(docobjdir)/gcjh.1) || \
 		(rm -f java/gcjh.1.T$$$$ && exit 1)
 	-rm -f java/gcjh.pod
 
-$(srcdir)/java/jv-scan.1: $(srcdir)/java/gcj.texi
+$(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$$$$ $(srcdir)/java/jv-scan.1) || \
+		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
 
-$(srcdir)/java/jcf-dump.1: $(srcdir)/java/gcj.texi
+$(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$$$$ $(srcdir)/java/jcf-dump.1) || \
+		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
 
-$(srcdir)/java/gij.1: $(srcdir)/java/gcj.texi
+$(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$$$$ $(srcdir)/java/gij.1) || \
+		mv -f java/gij.1.T$$$$ $(docobjdir)/gij.1) || \
 		(rm -f java/gij.1.T$$$$ && exit 1)
 	-rm -f java/gij.pod
 
-$(srcdir)/java/jv-convert.1: $(srcdir)/java/gcj.texi
+$(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$$$$ $(srcdir)/java/jv-convert.1) || \
+		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
 
-$(srcdir)/java/rmic.1: $(srcdir)/java/gcj.texi
+$(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$$$$ $(srcdir)/java/rmic.1) || \
+		mv -f java/rmic.1.T$$$$ $(docobjdir)/rmic.1) || \
 		(rm -f java/rmic.1.T$$$$ && exit 1)
 	-rm -f java/rmic.pod
 
-$(srcdir)/java/rmiregistry.1: $(srcdir)/java/gcj.texi
+$(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$$$$ $(srcdir)/java/rmiregistry.1) || \
+		mv -f java/rmiregistry.1.T$$$$ $(docobjdir)/rmiregistry.1) || \
 		(rm -f java/rmiregistry.1.T$$$$ && exit 1)
 	-rm -f java/rmiregistry.pod
 
@@ -419,32 +428,32 @@ java.install-man: installdirs $(GENERATED_JAVA_MANPAGES)
 	-if [ -f $(GCJ)$(exeext) ]; then \
 	  if [ -f $(GCJ)-cross$(exeext) ]; then \
 	    rm -f $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \
-	    $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \
+	    $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \
 	    chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \
 	  else \
 	    rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
-	    $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
+	    $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
 	    chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
 	  fi ; \
 	fi
 	-rm -f $(DESTDIR)$(man1dir)/gcjh$(man1ext)
-	-$(INSTALL_DATA) $(srcdir)/java/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext)
+	-$(INSTALL_DATA) $(docobjdir)/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext)
 	-chmod a-x $(DESTDIR)$(man1dir)/gcjh$(man1ext)
 	-rm -f $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
-	-$(INSTALL_DATA) $(srcdir)/java/jv-scan.1 $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
+	-$(INSTALL_DATA) $(docobjdir)/jv-scan.1 $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
 	-chmod a-x $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
 	-rm -f $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
-	-$(INSTALL_DATA) $(srcdir)/java/jcf-dump.1 $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
+	-$(INSTALL_DATA) $(docobjdir)/jcf-dump.1 $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
 	-chmod a-x $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
 	-rm -f $(DESTDIR)$(man1dir)/gij$(man1ext)
-	-$(INSTALL_DATA) $(srcdir)/java/gij.1 $(DESTDIR)$(man1dir)/gij$(man1ext)
+	-$(INSTALL_DATA) $(docobjdir)/gij.1 $(DESTDIR)$(man1dir)/gij$(man1ext)
 	-chmod a-x $(DESTDIR)$(man1dir)/gij$(man1ext)
 	-rm -f $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
-	-$(INSTALL_DATA) $(srcdir)/java/jv-convert.1 $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
+	-$(INSTALL_DATA) $(docobjdir)/jv-convert.1 $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
 	-chmod a-x $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
 	-rm -f $(DESTDIR)$(man1dir)/rmic$(man1ext)
-	-$(INSTALL_DATA) $(srcdir)/java/rmic.1 $(DESTDIR)$(man1dir)/rmic$(man1ext)
+	-$(INSTALL_DATA) $(docobjdir)/rmic.1 $(DESTDIR)$(man1dir)/rmic$(man1ext)
 	-chmod a-x $(DESTDIR)$(man1dir)/rmic$(man1ext)
 	-rm -f $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
-	-$(INSTALL_DATA) $(srcdir)/java/rmiregistry.1 $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
+	-$(INSTALL_DATA) $(docobjdir)/rmiregistry.1 $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
 	-chmod a-x $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)