diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 205 | ||||
| -rw-r--r-- | gcc/java/Makefile.in | 329 | ||||
| -rw-r--r-- | gcc/java/config-lang.in | 2 |
4 files changed, 139 insertions, 409 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 53408cf..78d2cf8 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,15 @@ +2000-10-27 Zack Weinberg <zack@wolery.stanford.edu> + + * Make-lang.in: Move all build rules here from Makefile.in, + adapt to new context. Wrap all rules that change the current + directory in parentheses. Expunge all references to $(P). + When one command depends on another and they're run all at + once, use && to separate them, not ;. Add OUTPUT_OPTION to + all object-file generation rules. Delete obsolete variables. + + * Makefile.in: Delete. + * config-lang.in: Delete outputs= line. + 2000-10-24 Tom Tromey <tromey@cygnus.com> * lex.c (java_new_lexer): Initialize new fields. Work around diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 5429f12..d1f794a 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -40,12 +40,6 @@ # - making any compiler driver (eg: g++) # - the compiler proper (eg: jc1) # - define the names for selecting the language in LANGUAGES. -# -# Extra flags to pass to recursive makes. -JAVA_FLAGS_TO_PASS = \ - "JAVA_FOR_BUILD=$(JAVA_FOR_BUILD)" \ - "JAVAFLAGS=$(JAVAFLAGS)" \ - "JAVA_FOR_TARGET=$(JAVA_FOR_TARGET)" # Actual names to use when installing a native compiler. JAVA_INSTALL_NAME = `t='$(program_transform_name)'; echo gcj | sed $$t` @@ -53,11 +47,11 @@ JAVA_INSTALL_NAME = `t='$(program_transform_name)'; echo gcj | sed $$t` # Actual names to use when installing a cross-compiler. JAVA_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcj | sed $$t` -# GCJ = gcj # Define the names for selecting java in LANGUAGES. -java: jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext) +java: jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) \ + gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext) # Define the name of target independant tools to be installed in $(bindir) # Names are subject to changes @@ -66,21 +60,9 @@ JAVA_TARGET_INDEPENDENT_BIN_TOOLS = gcjh jv-scan jcf-dump # Tell GNU make to ignore these if they exist. .PHONY: java -# Remember to keep this list in sync with JAVA_OBJS in Makefile.in!!! -# -JAVA_SRCS = $(srcdir)/java/parse.y $(srcdir)/java/class.c \ - $(srcdir)/java/decl.c $(srcdir)/java/expr.c $(srcdir)/java/constants.c \ - $(srcdir)/java/lang.c $(srcdir)/java/typeck.c $(srcdir)/java/except.c \ - $(srcdir)/java/verify.c $(srcdir)/java/zextract.c $(srcdir)/java/jcf-io.c \ - $(srcdir)/java/jcf-parse.c $(srcdir)/java/mangle.c \ - $(srcdir)/java/jcf-write.c $(srcdir)/java/buffer.c \ - $(srcdir)/java/check-init.c $(srcdir)/java/lex.c $(srcdir)/java/boehm.c \ - $(srcdir)/java/jcf-depend.c $(srcdir)/java/jcf-path.c \ - $(srcdir)/java/java-tree.h - jvspec.o: $(srcdir)/java/jvspec.c system.h $(GCC_H) $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ - $(INCLUDES) $(srcdir)/java/jvspec.c + $(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION) # Create the compiler driver for $(GCJ). $(GCJ)$(exeext): gcc.o jvspec.o version.o \ @@ -93,64 +75,68 @@ $(GCJ)-cross$(exeext): $(GCJ)$(exeext) -rm -f $(GCJ)-cross$(exeext) cp $(GCJ)$(exeext) $(GCJ)-cross$(exeext) -# Dependencies here must be kept in sync with dependencies in Makefile.in. -jvgenmain$(exeext): $(srcdir)/java/jvgenmain.c $(srcdir)/java/mangle.c \ - $(LIBDEPS) $(TREE_H) - cd java && $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jvgenmain$(exeext) +$(INTL_TARGETS): $(srcdir)/java/parse.c $(srcdir)/java/parse-scan.c -# This must be kept in sync with dependencies in Makefile.in. -GCJH_SOURCES = $(srcdir)/java/gjavah.c $(srcdir)/java/jcf-io.c \ - $(srcdir)/java/zextract.c $(srcdir)/java/jcf-reader.c \ - $(srcdir)/java/jcf.h $(srcdir)/java/javaop.h \ - $(srcdir)/java/javaop.def $(srcdir)/java/jcf-depend.c \ - $(srcdir)/java/jcf-path.c +$(srcdir)/java/parse.c: $(srcdir)/java/parse.y + (cd $(srcdir)/java && \ + $(BISON) -t --name-prefix=java_ $(BISONFLAGS) -o p$$$$.c parse.y && \ + mv -f p$$$$.c parse.c) -$(INTL_TARGETS): $(srcdir)/java/parse.c $(srcdir)/java/parse-scan.c +$(srcdir)/java/parse-scan.c: $(srcdir)/java/parse-scan.y + (cd $(srcdir)/java && \ + $(BISON) -t $(BISONFLAGS) -o ps$$$$.c parse-scan.y && \ + mv -f ps$$$$.c parse-scan.c) + +$(srcdir)/java/keyword.h: $(srcdir)/java/keyword.gperf + (cd $(srcdir)/java || exit 1; \ + gperf -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,3,$$ \ + keyword.gperf > k$$$$.h || { + echo "Please update gperf from ftp://ftp.gnu.org/pub/gnu/gperf/" >&2; \ + rm -f k$$$$.h; \ + exit 1; } \ + mv -f k$$$$.h keyword.gperf) + +# Executables built by this Makefile: +JAVA_OBJS = java/parse.o java/class.o java/decl.o java/expr.o \ + java/constants.o java/lang.o java/typeck.o java/except.o java/verify.o \ + java/zextract.o java/jcf-io.o java/jcf-parse.o java/mangle.o \ + java/jcf-write.o java/buffer.o java/check-init.o java/jcf-depend.o \ + java/jcf-path.o java/xref.o java/boehm.o mkdeps.o + +GCJH_OBJS = java/gjavah.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \ + java/zextract.o version.o mkdeps.o errors.o + +JVSCAN_OBJS = java/parse-scan.o java/jv-scan.o version.o + +JCFDUMP_OBJS = java/jcf-dump.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \ + java/zextract.o errors.o version.o mkdeps.o + +JVGENMAIN_OBJS = java/jvgenmain.o java/mangle.o + +# Use loose warnings for this front end. +java-warn = + +jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS) + rm -f $@ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ + $(JAVA_OBJS) $(BACKEND) $(ZLIB) $(LIBS) + +gcjh$(exeext): $(GCJH_OBJS) $(LIBDEPS) + rm -f $@ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJH_OBJS) $(ZLIB) $(LIBS) + +jv-scan$(exeext): $(JVSCAN_OBJS) $(LIBDEPS) + rm -f $@ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVSCAN_OBJS) $(LIBS) + +jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIBDEPS) + rm -f $@ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) $(ZLIB) $(LIBS) + +jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) + rm -f $@ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) -# Separating PARSE_DIR from PARSE_RELDIR lets us easily change the -# code to support building parse.c in the build directory, at some -# expense in readability. -# This code must be kept in sync with Makefile.in. -PARSE_DIR = $(srcdir)/java -PARSE_RELDIR = . -PARSE_C = $(PARSE_DIR)/parse.c -PARSE_SCAN_C = $(PARSE_DIR)/parse-scan.c - -SET_BISON = here=`pwd`; sdir=`cd $(srcdir) && pwd`; if test -f ../bison; then bison="$$here/../bison/bison -L $$sdir"; else bison=bison; fi -BISONFLAGS = -JAVABISONFLAGS = --name-prefix=java_ - -$(PARSE_C): $(srcdir)/java/parse.y - $(SET_BISON); \ - cd $(PARSE_DIR) ; $$bison -t $(BISONFLAGS) $(JAVABISONFLAGS) \ - -o p$$$$.c $(PARSE_RELDIR)/parse.y ; \ - mv -f p$$$$.c parse.c -$(PARSE_SCAN_C): $(srcdir)/java/parse-scan.y - $(SET_BISON); \ - cd $(PARSE_DIR) ; $$bison -t $(BISONFLAGS) -o ps$$$$.c \ - $(PARSE_RELDIR)/parse-scan.y ; \ - mv -f ps$$$$.c parse-scan.c - -# This must be kept in sync with dependencies in Makefile.in. -JV_SCAN_SOURCES = $(srcdir)/java/parse-scan.y $(srcdir)/java/lex.c \ - $(srcdir)/java/parse.h $(srcdir)/java/lex.h $(srcdir)/java/jv-scan.c - -# This must be kept in sync with dependencies in Makefile.in. -JCF_DUMP_SOURCES = $(srcdir)/java/jcf-dump.c $(srcdir)/java/jcf-io.c \ - $(srcdir)/java/zextract.c $(TREE_H) - -jc1$(exeext) gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext): s-java - -s-java: $(P) $(JAVA_SRCS) $(LIBDEPS) $(BACKEND) mkdeps.o \ - $(GCJH_SOURCES) $(LIBDEPS) $(TREE_H) \ - $(JV_SCAN_SOURCES) $(BACKEND) $(LIBDEPS) \ - $(JCF_DUMP_SOURCES) - cd java; $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) \ - ../jc1$(exeext) \ - ../gcjh$(exeext) \ - ../jv-scan$(exeext) \ - ../jcf-dump$(exeext) - touch s-java # # Build hooks: @@ -228,10 +214,73 @@ java.stage4: stage4-start # This target creates the files that can be rebuilt, but go in the # distribution anyway. It then copies the files to the distdir directory. -java.distdir: +java.distdir: java/parse.c java/hash.h mkdir tmp/java - cd java ; $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) parse.c hash.h cd java; \ for file in *[0-9a-zA-Z+]; do \ ln $$file ../tmp/java >/dev/null 2>&1 || cp $$file ../tmp/java; \ done + +# +# .o:.h dependencies. +JAVA_TREE_H = $(TREE_H) java/java-tree.h java/java-tree.def +JAVA_LEX_C = java/lex.c java/keyword.h + +java/parse.o: java/parse.c java/jcf-reader.c $(CONFIG_H) system.h \ + function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h java/lex.h $(GGC_H) +java/jcf-dump.o: $(CONFIG_H) system.h $(JAVA_TREE_H) java/jcf-dump.c \ + java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def version.h +java/gjavah.o: $(CONFIG_H) system.h $(JAVA_TREE_H) java/gjavah.c \ + java/jcf-reader.c java/jcf.h java/javaop.h version.h +java/boehm.o: java/boehm.c $(CONFIG_H) system.h $(TREE_H) $(JAVA_TREE_H) \ + java/parse.h +java/buffer.o: java/buffer.c $(CONFIG_H) java/buffer.h gansidecl.h \ + system.h toplev.h +java/check-init.o: java/check-init.c $(CONFIG_H) gansidecl.h \ + $(JAVA_TREE_H) system.h toplev.h +java/class.o: java/class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) java/jcf.h \ + java/parse.h gansidecl.h toplev.h system.h output.h $(GGC_H) +java/constants.o: java/constants.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ + toplev.h system.h $(GGC_H) +java/decl.o: java/decl.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ + toplev.h system.h function.h defaults.h gcc.h +java/except.o: java/except.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h real.h \ + $(RTL_H) java/javaop.h java/java-opcodes.h except.h java/java-except.h \ + eh-common.h toplev.h system.h function.h +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 $(GGC_H) +java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) system.h java/jcf.h +java/jcf-parse.o: java/jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) flags.h \ + input.h java/java-except.h system.h toplev.h java/parse.h $(GGC_H) +java/jcf-write.o: java/jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ + $(RTL_H) java/java-opcodes.h java/parse.h java/buffer.h system.h \ + toplev.h $(GGC_H) +java/jv-scan.o: java/jv-scan.c $(CONFIG_H) system.h version.h +java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) system.h +java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \ + toplev.h system.h $(RTL_H) $(EXPR_H) +java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) system.h \ + toplev.h $(GGC_H) +java/parse-scan.o: $(CONFIG_H) system.h toplev.h $(JAVA_LEX_C) java/parse.h \ + java/lex.h +java/typeck.o: java/typeck.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ + java/convert.h toplev.h system.h $(GGC_H) +java/verify.o: java/verify.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ + java/javaop.h java/java-opcodes.h java/java-except.h toplev.h system.h +java/xref.o: java/xref.c java/xref.h $(CONFIG_H) $(JAVA_TREE_H) toplev.h \ + system.h +java/zextract.o: java/zextract.c $(CONFIG_H) system.h java/zipfile.h + +# jcf-io.o needs $(ZLIBINC) added to cflags. +java/jcf-io.o: java/jcf-io.c $(CONFIG_H) system.h $(JAVA_TREE_H) + $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(ZLIBINC) \ + $(srcdir)/java/jcf-io.c $(OUTPUT_OPTION) + +# jcf-path.o needs a -D. +java/jcf-path.o: java/jcf-path.c $(CONFIG_H) system.h java/jcf.h + $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ + -DLIBGCJ_ZIP_FILE='"$(libgcj_zip)"' \ + $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION) + diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in deleted file mode 100644 index 8b57cbe..0000000 --- a/gcc/java/Makefile.in +++ /dev/null @@ -1,329 +0,0 @@ -# Makefile for GNU compiler for the Java(TM) language. -# Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1998, -# 1999 Free Software Foundation, Inc. - -#This file is part of GNU CC. - -#GNU CC is free software; you can redistribute it and/or modify -#it under the terms of the GNU General Public License as published by -#the Free Software Foundation; either version 2, or (at your option) -#any later version. - -#GNU CC is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#GNU General Public License for more details. - -#You should have received a copy of the GNU General Public License -#along with GNU CC; see the file COPYING. If not, write to -#the Free Software Foundation, 59 Temple Place - Suite 330, -#Boston, MA 02111-1307, USA. - -#Java and all Java-based marks are trademarks or registered trademarks -#of Sun Microsystems, Inc. in the United States and other countries. -#The Free Software Foundation is independent of Sun Microsystems, Inc. - -# The makefile built from this file lives in the language subdirectory. -# Its purpose is to provide support for: -# -# 1) recursion where necessary, and only then (building .o's), and -# 2) building and debugging cc1 from the language subdirectory, and -# 3) nothing else. -# -# The parent makefile handles all other chores, with help from the -# language makefile fragment, of course. -# -# The targets for external use are: -# all, TAGS, ???mostlyclean, ???clean. - -# Suppress smart makes who think they know how to automake Yacc files -.y.c: - -# Variables that exist for you to override. -# See below for how to change them for certain systems. - -# Various ways of specifying flags for compilations: -# CFLAGS is for the user to override to, e.g., do a bootstrap with -O2. -# BOOT_CFLAGS is the value of CFLAGS to pass -# to the stage2 and stage3 compilations -# XCFLAGS is used for most compilations but not when using the GCC just built. -XCFLAGS = -CFLAGS = -g -BOOT_CFLAGS = -O $(CFLAGS) -# These exists to be overridden by the x-* and t-* files, respectively. -X_CFLAGS = -T_CFLAGS = - -X_CPPFLAGS = -T_CPPFLAGS = - -CC = @CC@ -SET_BISON = here=`pwd`; sdir=`cd $(srcdir) && pwd`; if test -f ../../bison; then bison="$$here/../../bison/bison -L $$sdir"; else bison=bison; fi -BISONFLAGS = -JAVABISONFLAGS = --name-prefix=java_ -AR = ar -AR_FLAGS = rc -SHELL = /bin/sh -MAKEINFO = makeinfo -TEXI2DVI = texi2dvi - -# Define this as & to perform parallel make on a Sequent. -# Note that this has some bugs, and it seems currently necessary -# to compile all the gen* files first by hand to avoid erroneous results. -P = - -# This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET. -# It omits XCFLAGS, and specifies -B./. -# It also specifies -B$(tooldir)/ to find as and ld for a cross compiler. -GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) - -# Tools to use when building a cross-compiler. -# These are used because `configure' appends `cross-make' -# to the makefile when making a cross-compiler. - -# We don't use cross-make. Instead we use the tools -# from the build tree, if they are available. -# program_transform_name and objdir are set by configure.in. -program_transform_name = -objdir = . - -#version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c` -#mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c` - -# Directory where sources are, from where we are. -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Directory holding libgcj.zip. -prefix = @prefix@ -datadir = @datadir@ -libgcj_zip = $(datadir)/libgcj.zip - -# Additional system libraries to link with. -CLIB= - -# Top build directory, relative to here. -top_builddir = .. - -# Internationalization library. -INTLLIBS = @INTLLIBS@ - -# Choose the real default target. -ALL=all - -# End of variables for you to override. - -# Definition of `all' is here so that new rules inserted by sed -# do not specify the default target. -all: all.indirect - -# This tells GNU Make version 3 not to put all variables in the environment. -.NOEXPORT: - -# sed inserts variable overrides after the following line. -####target overrides -@target_overrides@ -####host overrides -@host_overrides@ -####cross overrides -@cross_overrides@ -####build overrides -@build_overrides@ -####site overrides -# -# Now figure out from those variables how to compile and link. - -all.indirect: Makefile ../jc1$(exeext) ../jcf-dump$(exeext) \ - ../jvgenmain$(exeext) ../gcjh$(exeext) ../jv-scan$(exeext) - -# IN_GCC tells obstack.h that we are using gcc's <stddef.h> file. -INTERNAL_CFLAGS = $(CROSS) -DIN_GCC @extra_c_flags@ - -# This is the variable actually used when we compile. -ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS) -W -Wall - -# Likewise. -ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) - -# This is where we get libiberty.a from. -LIBIBERTY = ../../libiberty/libiberty.a - -# This is where we get zlib from. zlibdir is -L../../zlib by default, -# and is nothing when configured with --enable-system-zlib. -ZLIB = @zlibdir@ -lz - -# How to link with both our special library facilities -# and the system's installed libraries. -LIBS = $(ZLIB) $(INTLLIBS) $(LIBIBERTY) $(CLIB) -LIBDEPS = $(INTLLIBS) $(LIBIBERTY) ../errors.o - -# Specify the directories to be searched for header files. -# Both . and srcdir are used, in that order, -# so that tm.h and config.h will be found in the compilation -# subdirectory rather than in the source directory. -INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config -I$(srcdir)/../../include @zlibinc@ - -# Always use -I$(srcdir)/config when compiling. -.c.o: - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< - -# -# Lists of files for various purposes. - -# Language-specific object files for Gcc/Java: - -# Remember to keep this list in sync with JAVA_SRCS in Make-lang.in!!! -# -JAVA_OBJS = parse.o class.o decl.o expr.o constants.o lang.o typeck.o \ - except.o verify.o zextract.o jcf-io.o jcf-parse.o mangle.o jcf-write.o \ - buffer.o check-init.o jcf-depend.o jcf-path.o xref.o boehm.o - -JAVA_OBJS_LITE = parse-scan.o jv-scan.o - -# Language-independent object files. -BACKEND = ../toplev.o ../mkdeps.o ../libbackend.a - -compiler: ../jc1$(exeext) ../jv-scan$(exeext) -../jc1$(exeext): $(P) $(JAVA_OBJS) $(BACKEND) $(LIBDEPS) - rm -f ../jc1$(exeext) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JAVA_OBJS) $(BACKEND) $(LIBS) -../jv-scan$(exeext): $(P) $(JAVA_OBJS_LITE) ../version.o $(LIBDEPS) - rm -f ../jv-scan$(exeext) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JAVA_OBJS_LITE) ../version.o $(LIBS) - -../jcf-dump$(exeext): jcf-dump.o jcf-io.o jcf-depend.o jcf-path.o \ - zextract.o ../version.o ../mkdeps.o $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ jcf-dump.o jcf-io.o \ - jcf-depend.o jcf-path.o zextract.o ../errors.o ../version.o \ - ../mkdeps.o $(LIBS) - -# Dependencies here must be kept in sync with dependencies in Make-lang.in. -../jvgenmain$(exeext): jvgenmain.o mangle.o $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ jvgenmain.o mangle.o $(LIBS) - -../gcjh$(exeext): gjavah.o jcf-io.o jcf-depend.o jcf-path.o \ - zextract.o ../version.o ../mkdeps.o $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gjavah.o jcf-io.o \ - jcf-depend.o jcf-path.o zextract.o ../errors.o ../version.o \ - ../mkdeps.o $(LIBS) - -Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure - cd ..; $(SHELL) config.status - -native: config.status ../jc1$(exeext) -# -# Compiling object files from source files. -TREE_H = $(srcdir)/../tree.h $(srcdir)/../real.h $(srcdir)/../tree.def \ - $(srcdir)/../machmode.h $(srcdir)/../machmode.def ../tree-check.h -JAVA_TREE_H = $(TREE_H) java-tree.h java-tree.def -RTL_H = $(srcdir)/../rtl.h $(srcdir)/../rtl.def \ - $(srcdir)/../machmode.h $(srcdir)/../machmode.def ../genrtl.h -EXPR_H = $(srcdir)/../expr.h ../insn-codes.h - -# Separating PARSE_DIR from PARSE_RELDIR lets us easily change the -# code to support building parse.c in the build directory, at some -# expense in readability. -# This code must be kept in sync with Make-lang.in. -PARSE_DIR = $(srcdir) -PARSE_RELDIR = . -PARSE_C = $(PARSE_DIR)/parse.c -PARSE_SCAN_C = $(PARSE_DIR)/parse-scan.c -PARSE_H = $(srcdir)/parse.h - -$(PARSE_C): $(srcdir)/parse.y - $(SET_BISON); \ - cd $(PARSE_DIR) ; $$bison -t $(BISONFLAGS) $(JAVABISONFLAGS) \ - -o p$$$$.c $(PARSE_RELDIR)/parse.y ; \ - mv -f p$$$$.c parse.c -$(PARSE_SCAN_C): $(srcdir)/parse-scan.y - $(SET_BISON); \ - cd $(PARSE_DIR) ; $$bison -t $(BISONFLAGS) -o ps$$$$.c \ - $(PARSE_RELDIR)/parse-scan.y ; \ - mv -f ps$$$$.c parse-scan.c - -lex.c: keyword.h lex.h - -lang.o: $(srcdir)/java-tree.def - -keyword.h: keyword.gperf - gperf -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,3,$$ \ - keyword.gperf > keyword.h || ( \ - echo "Please update your 'gperf' from ftp://ftp.gnu.org/pub/gnu/gperf/" >&2 ; \ - exit 1 ) - -jcf-path.o : jcf-path.c $(CONFIG_H) $(srcdir)/../system.h jcf.h - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -DLIBGCJ_ZIP_FILE='"$(libgcj_zip)"' $(srcdir)/jcf-path.c - -# These exist for maintenance purposes. - -# Update the tags table. -TAGS: force - cd $(srcdir) ; \ - etags *.c *.h ; \ - echo 'l' | tr 'l' '\f' >> TAGS ; \ - echo 'parse.y,0' >> TAGS ; \ - etags -a ../*.h ../*.c; - -.PHONY: TAGS - -mostlyclean: - rm -f *.o - -clean: mostlyclean - -force: - -parse.o : $(PARSE_C) jcf-reader.c $(CONFIG_H) $(srcdir)/../system.h \ - $(srcdir)/../function.h $(JAVA_TREE_H) $(srcdir)/lex.c $(PARSE_H) \ - $(srcdir)/lex.h $(srcdir)/../ggc.h -jcf-dump.o : $(CONFIG_H) $(srcdir)/../system.h $(JAVA_TREE_H) jcf-dump.c \ - jcf-reader.c jcf.h javaop.h javaop.def $(srcdir)/../version.h -gjavah.o : $(CONFIG_H) $(srcdir)/../system.h $(JAVA_TREE_H) gjavah.c \ - jcf-reader.c jcf.h javaop.h $(srcdir)/../version.h -boehm.o: boehm.c $(CONFIG_H) $(srcdir)/../system.h $(TREE_H) $(JAVA_TREE_H) \ - $(PARSE_H) -buffer.o : buffer.c $(CONFIG_H) buffer.h $(srcdir)/../gansidecl.h \ - $(srcdir)/../system.h $(srcdir)/../toplev.h -check-init.o : check-init.c $(CONFIG_H) $(srcdir)/../gansidecl.h \ - $(JAVA_TREE_H) $(srcdir)/../system.h $(srcdir)/../toplev.h -class.o : class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) jcf.h $(PARSE_H) \ - $(srcdir)/../gansidecl.h $(srcdir)/../toplev.h $(srcdir)/../system.h \ - $(srcdir)/../output.h $(srcdir)/../ggc.h -constants.o : constants.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h \ - $(srcdir)/../toplev.h $(srcdir)/../system.h $(srcdir)/../ggc.h -decl.o : decl.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h \ - $(srcdir)/../toplev.h $(srcdir)/../system.h $(srcdir)/../function.h \ - $(srcdir)/../defaults.h $(srcdir)/../gcc.h -except.o : except.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../real.h \ - $(RTL_H) javaop.h java-opcodes.h $(srcdir)/../except.h java-except.h \ - $(srcdir)/../eh-common.h $(srcdir)/../toplev.h $(srcdir)/../system.h \ - $(srcdir)/../function.h -expr.o : expr.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../real.h \ - $(RTL_H) $(EXPR_H) javaop.h java-opcodes.h $(srcdir)/../except.h \ - java-except.h java-except.h parse.h $(srcdir)/../toplev.h \ - $(srcdir)/../system.h $(srcdir)/../ggc.h -jcf-depend.o : jcf-depend.c $(CONFIG_H) $(srcdir)/../system.h jcf.h -jcf-io.o : jcf-io.c $(CONFIG_H) $(srcdir)/../system.h $(JAVA_TREE_H) -jcf-parse.o : jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) $(srcdir)/../flags.h \ - $(srcdir)/../input.h java-except.h $(srcdir)/../system.h \ - $(srcdir)/../toplev.h $(PARSE_H) $(srcdir)/../ggc.h -jcf-write.o : jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(RTL_H) \ - java-opcodes.h parse.h buffer.h $(srcdir)/../system.h \ - $(srcdir)/../toplev.h $(srcdir)/../ggc.h -jv-scan.o : jv-scan.c $(CONFIG_H) $(srcdir)/../system.h $(srcdir)/../version.h -jvgenmain.o : jvgenmain.c $(CONFIG_H) $(srcdir)/../system.h -lang.o : lang.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../input.h \ - $(srcdir)/../toplev.h $(srcdir)/../system.h $(RTL_H) $(EXPR_H) -mangle.o : mangle.c $(CONFIG_H) jcf.h $(JAVA_TREE_H) $(srcdir)/../system.h \ - $(srcdir)/../toplev.h $(srcdir)/../ggc.h -parse-scan.o : $(CONFIG_H) $(srcdir)/../system.h $(srcdir)/../toplev.h \ - $(srcdir)/lex.c $(PARSE_H) $(srcdir)/lex.h -typeck.o : typeck.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h convert.h \ - $(srcdir)/../toplev.h $(srcdir)/../system.h $(srcdir)/../ggc.h -verify.o : verify.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h javaop.h java-opcodes.h \ - java-except.h $(srcdir)/../toplev.h $(srcdir)/../system.h -xref.o : xref.c xref.h $(CONFIG_H) $(JAVA_TREE_H) $(srcdir)/../toplev.h \ - $(srcdir)/../system.h -zextract.o : zextract.c $(CONFIG_H) $(srcdir)/../system.h zipfile.h - diff --git a/gcc/java/config-lang.in b/gcc/java/config-lang.in index 07f7749..e7c858a 100644 --- a/gcc/java/config-lang.in +++ b/gcc/java/config-lang.in @@ -36,5 +36,3 @@ language="java" compilers="jc1\$(exeext) jvgenmain\$(exeext)" stagestuff="jc1\$(exeext) gcj\$(exeext) jvgenmain\$(exeext) gcjh\$(exeext) jv-scan\$(exeext) jcf-dump\$(exeext)" - -outputs=java/Makefile |