gcc_attribute.m4 (GCC_ATTRIBUTE): Fix cache variable name.

libjava/classpath/

	* m4/gcc_attribute.m4 (GCC_ATTRIBUTE): Fix cache variable name.
	* tools/Makefile.am (gappletviewer, gjarsigner, gkeytool, gjar)
	(gnative2ascii, gserialver, gjavah, grmiregistry, gtnameserv)
	(gorbd, grmid, grmic) [!CREATE_WRAPPERS]: Add stub dependencies
	for these scripts, to trick automake into hiding the respective
	rules for the programs below the CREATE_WRAPPERS conditional.
	* aclocal.m4: Regenerate.
	* configure: Likewise.
	* Makefile.in: Likewise.
	* native/jni/Makefile.in: Likewise.
	* native/jni/classpath/Makefile.in: Likewise.
	* native/jni/gstreamer-peer/Makefile.in: Likewise.
	* native/jni/midi-dssi/Makefile.in: Likewise.
	* native/jni/gconf-peer/Makefile.in: Likewise.
	* native/jni/java-io/Makefile.in: Likewise.
	* native/jni/native-lib/Makefile.in: Likewise.
	* native/jni/java-util/Makefile.in: Likewise.
	* native/jni/java-lang/Makefile.in: Likewise.
	* native/jni/midi-alsa/Makefile.in: Likewise.
	* native/jni/java-nio/Makefile.in: Likewise.
	* native/jni/java-net/Makefile.in: Likewise.
	* native/jni/xmlj/Makefile.in: Likewise.
	* native/jni/qt-peer/Makefile.in: Likewise.
	* native/jni/gtk-peer/Makefile.in: Likewise.
	* native/Makefile.in: Likewise.
	* native/jawt/Makefile.in: Likewise.
	* native/fdlibm/Makefile.in: Likewise.
	* native/plugin/Makefile.in: Likewise.
	* resource/Makefile.in: Likewise.
	* scripts/Makefile.in: Likewise.
	* tools/Makefile.in: Likewise.
	* doc/Makefile.in: Likewise.
	* doc/api/Makefile.in: Likewise.
	* lib/Makefile.in: Likewise.
	* external/Makefile.in: Likewise.
	* external/jsr166/Makefile.in: Likewise.
	* external/sax/Makefile.in: Likewise.
	* external/w3c_dom/Makefile.in: Likewise.
	* external/relaxngDatatype/Makefile.in: Likewise.
	* include/Makefile.in: Likewise.
	* examples/Makefile.in: Likewise.

From-SVN: r134413

2 files changed, 62 insertions, 36 deletions

diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index de54eed..773157d 100755
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -100,6 +100,19 @@ noinst_SCRIPTS = gappletviewer gjarsigner gkeytool \
 	gjar gnative2ascii gserialver gjavah grmiregistry \
 	gtnameserv gorbd grmid grmic
 bin_PROGRAMS =
+## FIXME: revisit this with a newer automake.
+gappletviewer: gappletviewer.in
+gjarsigner: gjarsigner.in
+gkeytool: gkeytool.in
+gjar: gjar.in
+gnative2ascii: gnative2ascii.in
+gserialver: gserialver.in
+gjavah: gjavah.in
+grmiregistry: grmiregistry.in
+gtnameserv: gtnameserv.in
+gorbd: gorbd.in
+grmid: grmid.in
+grmic: grmic.in
 endif
 EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \
 	gjar.in gnative2ascii.in gserialver.in gjavah.in grmiregistry.in \
diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in
index ef1b2d0..68991e9 100644
--- a/libjava/classpath/tools/Makefile.in
+++ b/libjava/classpath/tools/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
 	$(top_srcdir)/../../config/lead-dot.m4 \
 	$(top_srcdir)/../../config/multi.m4 \
 	$(top_srcdir)/../../config/no-executables.m4 \
+	$(top_srcdir)/../../config/proginstall.m4 \
 	$(top_srcdir)/../../libtool.m4 \
 	$(top_srcdir)/../../ltoptions.m4 \
 	$(top_srcdir)/../../ltsugar.m4 \
@@ -639,42 +640,42 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
 	  done; \
 	done; rm -f c$${pid}_.???; exit $$bad
-gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) 
-	@rm -f gappletviewer$(EXEEXT)
-	$(LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
-gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) 
-	@rm -f gjar$(EXEEXT)
-	$(LINK) $(gjar_LDFLAGS) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS)
-gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
-	@rm -f gjarsigner$(EXEEXT)
-	$(LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
-gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) 
-	@rm -f gjavah$(EXEEXT)
-	$(LINK) $(gjavah_LDFLAGS) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
-gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) 
-	@rm -f gkeytool$(EXEEXT)
-	$(LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
-gnative2ascii$(EXEEXT): $(gnative2ascii_OBJECTS) $(gnative2ascii_DEPENDENCIES) 
-	@rm -f gnative2ascii$(EXEEXT)
-	$(LINK) $(gnative2ascii_LDFLAGS) $(gnative2ascii_OBJECTS) $(gnative2ascii_LDADD) $(LIBS)
-gorbd$(EXEEXT): $(gorbd_OBJECTS) $(gorbd_DEPENDENCIES) 
-	@rm -f gorbd$(EXEEXT)
-	$(LINK) $(gorbd_LDFLAGS) $(gorbd_OBJECTS) $(gorbd_LDADD) $(LIBS)
-grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) 
-	@rm -f grmic$(EXEEXT)
-	$(LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS)
-grmid$(EXEEXT): $(grmid_OBJECTS) $(grmid_DEPENDENCIES) 
-	@rm -f grmid$(EXEEXT)
-	$(LINK) $(grmid_LDFLAGS) $(grmid_OBJECTS) $(grmid_LDADD) $(LIBS)
-grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grmiregistry_DEPENDENCIES) 
-	@rm -f grmiregistry$(EXEEXT)
-	$(LINK) $(grmiregistry_LDFLAGS) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS)
-gserialver$(EXEEXT): $(gserialver_OBJECTS) $(gserialver_DEPENDENCIES) 
-	@rm -f gserialver$(EXEEXT)
-	$(LINK) $(gserialver_LDFLAGS) $(gserialver_OBJECTS) $(gserialver_LDADD) $(LIBS)
-gtnameserv$(EXEEXT): $(gtnameserv_OBJECTS) $(gtnameserv_DEPENDENCIES) 
-	@rm -f gtnameserv$(EXEEXT)
-	$(LINK) $(gtnameserv_LDFLAGS) $(gtnameserv_OBJECTS) $(gtnameserv_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gappletviewer$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gjar$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gjar_LDFLAGS) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gjarsigner$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gjavah$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gjavah_LDFLAGS) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gkeytool$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gnative2ascii$(EXEEXT): $(gnative2ascii_OBJECTS) $(gnative2ascii_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gnative2ascii$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gnative2ascii_LDFLAGS) $(gnative2ascii_OBJECTS) $(gnative2ascii_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gorbd$(EXEEXT): $(gorbd_OBJECTS) $(gorbd_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gorbd$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gorbd_LDFLAGS) $(gorbd_OBJECTS) $(gorbd_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f grmic$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@grmid$(EXEEXT): $(grmid_OBJECTS) $(grmid_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f grmid$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(grmid_LDFLAGS) $(grmid_OBJECTS) $(grmid_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grmiregistry_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f grmiregistry$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(grmiregistry_LDFLAGS) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gserialver$(EXEEXT): $(gserialver_OBJECTS) $(gserialver_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gserialver$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gserialver_LDFLAGS) $(gserialver_OBJECTS) $(gserialver_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gtnameserv$(EXEEXT): $(gtnameserv_OBJECTS) $(gtnameserv_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@	@rm -f gtnameserv$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@	$(LINK) $(gtnameserv_LDFLAGS) $(gtnameserv_OBJECTS) $(gtnameserv_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -1092,6 +1093,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am
 
 @FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@@FOUND_JAVAC_FALSE@error dunno how to setup the JCOMPILER and compile
+@CREATE_WRAPPERS_FALSE@gappletviewer: gappletviewer.in
+@CREATE_WRAPPERS_FALSE@gjarsigner: gjarsigner.in
+@CREATE_WRAPPERS_FALSE@gkeytool: gkeytool.in
+@CREATE_WRAPPERS_FALSE@gjar: gjar.in
+@CREATE_WRAPPERS_FALSE@gnative2ascii: gnative2ascii.in
+@CREATE_WRAPPERS_FALSE@gserialver: gserialver.in
+@CREATE_WRAPPERS_FALSE@gjavah: gjavah.in
+@CREATE_WRAPPERS_FALSE@grmiregistry: grmiregistry.in
+@CREATE_WRAPPERS_FALSE@gtnameserv: gtnameserv.in
+@CREATE_WRAPPERS_FALSE@gorbd: gorbd.in
+@CREATE_WRAPPERS_FALSE@grmid: grmid.in
+@CREATE_WRAPPERS_FALSE@grmic: grmic.in
 
 # Make sure everything is included in the distribution.
 dist-hook: