diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f26689a..a458b4d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2000-05-06 Tom Tromey <tromey@cygnus.com> + + * Makefile.in: Rebuilt. + * Makefile.am (libgcj.zip): Don't pass -L to javac. + 2000-05-05 Tom Tromey <tromey@cygnus.com> Fix for PR libgcj/220: diff --git a/libjava/Makefile.am b/libjava/Makefile.am index b243822..614f870 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -173,7 +173,7 @@ libgcj.zip: $(java_source_files) $(cond_awt_java_source_files) ## This little nastiness is here so that the backquoted stuff in the ## GCJ definition can be correctly expanded, if required. javac="$(JAVAC)"; cd $(srcdir); \ - $$javac -L$(here) $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ + $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ $(subst $(srcdir)/,,$?) -@rm -f libgcj.zip ## Note that we explicitly want to include directory information. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index ef81c3e..027af04 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1708,7 +1708,7 @@ $(built_java_source_files:.java=.class): $(built_java_source_files) libgcj.zip: $(java_source_files) $(cond_awt_java_source_files) $(MAKE) $(built_java_source_files:.java=.class) javac="$(JAVAC)"; cd $(srcdir); \ - $$javac -L$(here) $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ + $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \ $(subst $(srcdir)/,,$?) -@rm -f libgcj.zip $(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/' |