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, 5 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index aba7b24f271..a7dc8273307 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-09-09 Michael Koch <konqueror@gmx.de> + + * Makefile.am: Don't try to include deps.mk. + * Makefile.in: Regenerated. + 2004-09-08 Bryce McKinlay <mckinlay@redhat.com> * configure.ac (AC_CONFIG_COMMANDS): Don't create subdirectories and diff --git a/libjava/Makefile.am b/libjava/Makefile.am index a959c4c2b04..2629af52957 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -3140,8 +3140,6 @@ texinfo: TexinfoDoclet.class ## Dependency tracking madness. ## --include deps.mk - ## This is an evil hack to work around an automake limitation. We ## need to ensure that all CNI headers are built, not just the ones used ## internally by libgcj. We can't make the .o files depend on nat_headers, diff --git a/libjava/Makefile.in b/libjava/Makefile.in index e2783abb269..0b2696a3b0b 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -22049,8 +22049,6 @@ texinfo: TexinfoDoclet.class javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/jar/*.java javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .:$(srcdir) $(srcdir)/java/util/zip/*.java --include deps.mk - all-recursive: libgcj-@gcc_version@.jar $(nat_headers) $(xlib_nat_headers) # Multilib support. |
