diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/java/Makefile.in | 18 | ||||
| -rw-r--r-- | gcc/java/gjavah.c | 2 | ||||
| -rw-r--r-- | gcc/java/jcf-dump.c | 2 | ||||
| -rw-r--r-- | gcc/java/jv-scan.c | 2 |
5 files changed, 23 insertions, 13 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 31d6201..315cf0b 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,15 @@ +2000-02-15 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * Makefile.in (jv-scan, jcf-dump, gcjh): Depend on and link with + version.o. + (jcf-dump.o, gjavah.o, jv-scan.o): Depend on version.h. + + * gjavah.c: Include version.h. + + * jcf-dump.c: Likewise. + + * jv-scan.c: Likewise. + 2000-02-10 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * except.c (check_start_handlers): Re-add prototype lost in last diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in index 82a0b42..07e4f22 100644 --- a/gcc/java/Makefile.in +++ b/gcc/java/Makefile.in @@ -177,23 +177,23 @@ compiler: ../jc1$(exeext) ../jv-scan$(exeext) ../jc1$(exeext): $(P) $(JAVA_OBJS) $(OBJDEPS) $(LIBDEPS) rm -f ../jc1$(exeext) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JAVA_OBJS) $(OBJS) $(LIBS) -../jv-scan$(exeext): $(P) $(JAVA_OBJS_LITE) $(OBJDEPS) $(LIBDEPS) +../jv-scan$(exeext): $(P) $(JAVA_OBJS_LITE) $(OBJDEPS) ../version.o $(LIBDEPS) rm -f ../jv-scan$(exeext) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JAVA_OBJS_LITE) $(LIBS) + $(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 $(LIBDEPS) + zextract.o ../version.o $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ jcf-dump.o jcf-io.o \ - jcf-depend.o jcf-path.o zextract.o ../errors.o $(LIBS) + jcf-depend.o jcf-path.o zextract.o ../errors.o ../version.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 $(LIBDEPS) + zextract.o ../version.o $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gjavah.o jcf-io.o \ - jcf-depend.o jcf-path.o zextract.o ../errors.o $(LIBS) + jcf-depend.o jcf-path.o zextract.o ../errors.o ../version.o $(LIBS) Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure cd ..; $(SHELL) config.status @@ -264,9 +264,9 @@ force: parse.o : $(PARSE_C) jcf-reader.c $(CONFIG_H) $(srcdir)/../system.h \ $(srcdir)/../function.h $(JAVA_TREE_H) jcf-dump.o : $(CONFIG_H) $(srcdir)/../system.h $(JAVA_TREE_H) jcf-dump.c \ - jcf-reader.c jcf.h javaop.h javaop.def + 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 + jcf-reader.c jcf.h javaop.h $(srcdir)/../version.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 \ @@ -294,7 +294,7 @@ jcf-parse.o : jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) $(srcdir)/../flags.h \ $(srcdir)/../toplev.h $(PARSE_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 -jv-scan.o : jv-scan.c $(CONFIG_H) $(srcdir)/../system.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) diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index 7cc004f..c679491d 100644 --- a/gcc/java/gjavah.c +++ b/gcc/java/gjavah.c @@ -34,8 +34,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "java-tree.h" #include "java-opcodes.h" -#include "version.c" - #include <getopt.h> diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c index 28092d2..9d3f829 100644 --- a/gcc/java/jcf-dump.c +++ b/gcc/java/jcf-dump.c @@ -53,7 +53,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "tree.h" #include "java-tree.h" -#include "version.c" +#include "version.h" #include <getopt.h> diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c index d7c5a0c..f803e2c 100644 --- a/gcc/java/jv-scan.c +++ b/gcc/java/jv-scan.c @@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA. */ #include "obstack.h" /* We use obstacks in lex.c */ -#include "version.c" +#include "version.h" #include <getopt.h> |