This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[JAVA] Respect parsedir and objdocdir
- From: Kelley Cook <kcook34 at ford dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 16 Oct 2003 16:38:41 -0400
- Subject: [JAVA] Respect parsedir and objdocdir
- Hop-count: 1
- Reply-to: Kelley Cook <kelleycook at wideopenwest dot com>
As a followup to http://gcc.gnu.org/ml/gcc-patches/2003-10/msg01335.html
This patch simply causes the java directory to respect parsedir and
objdocdir.
OK?
Tested along with the aformentioned patch. It is independent of it though.
Kelley Cook
2003-10-16 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in: Honor $(parsedir) and $(objdocdir).
diff -upr /home/kcook34/gcc-3.4-20031008/gcc/java/Make-lang.in /home/kcook34/gcc-snapshot/gcc/java/Make-lang.in
--- /home/kcook34/gcc-3.4-20031008/gcc/java/Make-lang.in 2003-10-14 15:07:21.000000000 -0400
+++ /home/kcook34/gcc-snapshot/gcc/java/Make-lang.in 2003-10-16 12:27:07.894850000 -0400
@@ -160,12 +160,12 @@ java.rest.encap:
java.tags: force
cd $(srcdir)/java; etags *.y *.c *.h --language=none --regex='/DEFTREECODE [(]\([A-Z_]+\)/\1/' java-tree.def
-info:: $(srcdir)/java/gcj.info
+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
@@ -213,9 +213,9 @@ java.uninstall:
java.install-info: installdirs
if [ -f jc1$(exeext) ] ; then \
- if [ -f $(srcdir)/java/gcj.info ]; then \
+ if [ -f $(docobjdir)/gcj.info ]; then \
rm -f $(DESTDIR)$(infodir)/gcj.info*; \
- for f in $(srcdir)/java/gcj.info*; do \
+ for f in $(docobjdir)/gcj.info*; do \
realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
$(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
done; \
@@ -244,12 +244,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.
@@ -272,9 +272,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)
@@ -303,13 +300,6 @@ java/expr.o: java/expr.c $(CONFIG_H) $(J
$(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 \
@@ -329,8 +319,6 @@ java/mangle.o: java/mangle.c $(CONFIG_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
@@ -345,6 +333,18 @@ java/xref.o: java/xref.c java/xref.h $(C
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)
@@ -353,19 +353,28 @@ java/jcf-io.o: java/jcf-io.c $(CONFIG_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
-$(srcdir)/java/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 stmp-docobjdir $(docdir)/include/gcc-common.texi
if test "x$(BUILD_INFO)" = xinfo; then \
- rm -f $(srcdir)/java/gcc.info*; \
- cd $(srcdir)/java && $(MAKEINFO) -I../doc/include -o gcj.info 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 \
@@ -373,59 +382,59 @@ java/gcj.dvi: $(srcdir)/java/gcj.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
@@ -434,32 +443,32 @@ java.install-man: installdirs $(GENERATE
-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)