java patch from Per

diff --git a/ChangeLog b/ChangeLog
index 7a099103ec2a91d83d6d0be273962a7600505cb7..5ea0d0e579e9939b8c3c293f21123d4894e5e644 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Mar 19 01:33:35 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_java): Put JAVACFLAGS after -d option.  From
+       Per Bothner.
+
        * automake.in (handle_java): Use $(JAVAROOT) in place of `../..'
        in default CLASSPATH.
        (am_install_var): Allow `JAVA' variable to be defined.  Don't

diff --git a/Makefile.in b/Makefile.in
index f25e0fd042a8c4b553d2102e05df2e8d54eed762..f85dd9a593c3b596d8e35f383805bb80bb993be8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.2g from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -109,14 +109,14 @@ stamp-vti texinfo.tex version.texi ylwrap
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP = --best
-all: all-recursive all-am
+default: all
 
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -474,6 +474,8 @@ install: install-recursive install-exec-am install-data-am
 
 uninstall: uninstall-recursive uninstall-am
 
+all: all-recursive all-am
+
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
@@ -519,12 +521,12 @@ maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "it deletes files that may require special tools to rebuild."
        -rm -f config.status
 
-.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataSCRIPTS \
-install-pkgdataSCRIPTS mostlyclean-vti distclean-vti clean-vti \
-maintainer-clean-vti install-info-am uninstall-info mostlyclean-aminfo \
-distclean-aminfo clean-aminfo maintainer-clean-aminfo \
-uninstall-pkgdataDATA install-pkgdataDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
+.PHONY: default uninstall-binSCRIPTS install-binSCRIPTS \
+uninstall-pkgdataSCRIPTS install-pkgdataSCRIPTS mostlyclean-vti \
+distclean-vti clean-vti maintainer-clean-vti install-info-am \
+uninstall-info mostlyclean-aminfo distclean-aminfo clean-aminfo \
+maintainer-clean-aminfo uninstall-pkgdataDATA install-pkgdataDATA \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \

diff --git a/automake.in b/automake.in
index fb39ff8f6dd1561da23f92a55c5c148a5bd7fc66..450332c3defb40056f5cba002538f0e8992e72a4 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3908,8 +3908,8 @@ sub handle_java
     }
 
     $output_rules .= ('class' . $dir . '.stamp: $(' . $dir . '_JAVA)' . "\n"
-                     . "\t" . '$(CLASSPATH_ENV) $(JAVAC) $(JAVACFLAGS) '
-                     . '-d $(JAVAROOT) $?' . "\n"
+                     . "\t" . '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) '
+                     . '$(JAVACFLAGS) $?' . "\n"
                      . "\t" . 'echo timestamp > class' . $dir . '.stamp'
                      . "\n");
     push (@all, 'class' . $dir . '.stamp');

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 3f0f5814479a25167f96d5ac91c20805f7b5eb86..73b2d0ac56cad06ea78c64d04c720e90ea469465 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.2g from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -81,13 +81,13 @@ DIST_COMMON =  Makefile.am Makefile.in
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP = --best
-all: Makefile $(DATA)
+default: all
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -146,6 +146,8 @@ install: install-exec install-data all
 
 uninstall: uninstall-m4dataDATA
 
+all: Makefile $(DATA)
+
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
@@ -177,8 +179,8 @@ maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: uninstall-m4dataDATA install-m4dataDATA tags distdir info dvi \
-installcheck install-exec install-data install uninstall all \
+.PHONY: default uninstall-m4dataDATA install-m4dataDATA tags distdir \
+info dvi installcheck install-exec install-data install uninstall all \
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b2b8cc31937ed0f2b0ea9e4a5eda2d39db15a382..1ca6c9fc8274de5df8a95c2b4274f774c59a6d6a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -90,7 +90,7 @@ xsource.test libobj6.test depend3.test output5.test ammissing.test \
 install.test libobj7.test objc.test cond3.test cxxcpp.test \
 aclocal.test alpha.test whoami.test unused.test condman.test \
 texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
-java.test sinclude.test
+java.test sinclude.test javaprim.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs