diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-06 16:25:13 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-06 16:25:13 +0000 |
| commit | 0833e3d6735b4caa58cd5f5876a1dfd452b31387 (patch) | |
| tree | d6dbcb95a914ccdcada1caa658e8c28ee5972a21 | |
| parent | b37d88dca9e85b7de6a546ddecaff86174f79ea5 (diff) | |
| download | gcc-0833e3d6735b4caa58cd5f5876a1dfd452b31387.tar.gz | |
* Makefile.in: Rebuilt.
* Makefile.am (libgcj.zip): Don't pass -L to javac.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33728 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 f26689af4ff..a458b4d13e6 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 b243822c0da..614f870f74b 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 ef81c3e9f5c..027af04e901 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 '*/' |