* Make-lang.in (java/parse.o, java/parse-scan.o): Depend on input.h.

	* lex.h: #include input.h.
	* jv-scan.c (input_filename): Remove.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66452 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 5fa16b5..d8c23e4 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-04  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * Make-lang.in (java/parse.o, java/parse-scan.o): Depend on input.h.
+       * lex.h: #include input.h.
+       * jv-scan.c (input_filename): Remove.
+
 2003-05-02  Tom Tromey  <tromey@redhat.com>
 
        PR java/10491:

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 5d74714..0440dc3 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -271,7 +271,7 @@ 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 $(GGC_H) debug.h gt-java-parse.h gtype-java.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)
@@ -328,7 +328,7 @@ java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_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
+  $(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

diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
index 7e0e813..7c8d2d3 100644 (file)
--- a/gcc/java/jv-scan.c
+++ b/gcc/java/jv-scan.c
@@ -55,9 +55,6 @@ static void version (void) ATTRIBUTE_NORETURN;
 /* Current input file and output file IO streams.  */
 FILE *finput, *out;
 
-/* Current input filename.  */
-char *input_filename;
-
 /* Executable name.  */
 char *exec_name;
 

diff --git a/gcc/java/lex.h b/gcc/java/lex.h
index 850ce68..037d044 100644 (file)
--- a/gcc/java/lex.h
+++ b/gcc/java/lex.h
@@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #ifndef GCC_JAVA_LEX_H
 #define GCC_JAVA_LEX_H
 
+#include "input.h"
+
 /* Extern global variables declarations  */
 extern FILE *finput;