Commit af18ebae by Carlos O'Donell Committed by Carlos O'Donell

Makefile.am: Add install-html target.


2006-05-24  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.am: Add install-html target. Add install-html to .PHONY
	* Makefile.in: Regenerate.
	* aclocal.m4: Regenerate.
	* gcj/Makefile.in: Regenerate.
	* include/Makefile.in: Regenerate.
	* testsuite/Makefile.in: Regenerate.

From-SVN: r114054
parent 1fb34f17
2006-05-24 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* gcj/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
2006-05-24 Andreas Tobler <a.tobler@schweiz.ch> 2006-05-24 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/libjava.lang/stacktrace.java: New file. * testsuite/libjava.lang/stacktrace.java: New file.
......
...@@ -982,6 +982,10 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host ...@@ -982,6 +982,10 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
MAKEOVERRIDES= MAKEOVERRIDES=
# No install-html support yet.
.PHONY: install-html
install-html:
# Multilib support variables. # Multilib support variables.
MULTISRCTOP = MULTISRCTOP =
MULTIBUILDTOP = MULTIBUILDTOP =
......
# Makefile.in generated by automake 1.9.3 from Makefile.am. # Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004 Free Software Foundation, Inc. # 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(lib_gnu_java_awt_peer_gtk_la_SOURCES) $(lib_gnu_java_awt_peer_qt_la_SOURCES) $(libgcj_la_SOURCES) $(libgcjawt_la_SOURCES) $(libgij_la_SOURCES) $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
...@@ -8306,7 +8304,13 @@ uninstall-toolexecmainlibDATA: ...@@ -8306,7 +8304,13 @@ uninstall-toolexecmainlibDATA:
# (which will cause the Makefiles to be regenerated when you run `make'); # (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line. # (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS): $(RECURSIVE_TARGETS):
@set fnord $$MAKEFLAGS; amf=$$2; \ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \ dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \ target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \ list='$(SUBDIRS)'; for subdir in $$list; do \
...@@ -8318,7 +8322,7 @@ $(RECURSIVE_TARGETS): ...@@ -8318,7 +8322,7 @@ $(RECURSIVE_TARGETS):
local_target="$$target"; \ local_target="$$target"; \
fi; \ fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ || eval $$failcom; \
done; \ done; \
if test "$$dot_seen" = "no"; then \ if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
...@@ -8326,7 +8330,13 @@ $(RECURSIVE_TARGETS): ...@@ -8326,7 +8330,13 @@ $(RECURSIVE_TARGETS):
mostlyclean-recursive clean-recursive distclean-recursive \ mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive: maintainer-clean-recursive:
@set fnord $$MAKEFLAGS; amf=$$2; \ @failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \ dot_seen=no; \
case "$@" in \ case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
...@@ -8347,7 +8357,7 @@ maintainer-clean-recursive: ...@@ -8347,7 +8357,7 @@ maintainer-clean-recursive:
local_target="$$target"; \ local_target="$$target"; \
fi; \ fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ || eval $$failcom; \
done && test -z "$$fail" done && test -z "$$fail"
tags-recursive: tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \ list='$(SUBDIRS)'; for subdir in $$list; do \
...@@ -11292,6 +11302,10 @@ create-headers: $(headers_to_make) ...@@ -11292,6 +11302,10 @@ create-headers: $(headers_to_make)
$(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp $(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp
$(libgij_la_OBJECTS): headers.stamp $(libgij_la_OBJECTS): headers.stamp
# No install-html support yet.
.PHONY: install-html
install-html:
# Multilib support. # Multilib support.
.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
maintainer-clean-multi maintainer-clean-multi
......
# Makefile.in generated by automake 1.9.3 from Makefile.am. # Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004 Free Software Foundation, Inc. # 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
...@@ -123,7 +123,6 @@ GCSPEC = @GCSPEC@ ...@@ -123,7 +123,6 @@ GCSPEC = @GCSPEC@
GCTESTSPEC = @GCTESTSPEC@ GCTESTSPEC = @GCTESTSPEC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTK_AWT_FALSE = @GTK_AWT_FALSE@ GTK_AWT_FALSE = @GTK_AWT_FALSE@
GTK_AWT_TRUE = @GTK_AWT_TRUE@ GTK_AWT_TRUE = @GTK_AWT_TRUE@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
...@@ -225,7 +224,6 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ ...@@ -225,7 +224,6 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
...@@ -234,8 +232,14 @@ ZINCS = @ZINCS@ ...@@ -234,8 +232,14 @@ ZINCS = @ZINCS@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
ac_ct_AR = @ac_ct_AR@
ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_GCJ = @ac_ct_GCJ@
ac_ct_LD = @ac_ct_LD@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
...@@ -255,10 +259,7 @@ build_os = @build_os@ ...@@ -255,10 +259,7 @@ build_os = @build_os@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
dbexecdir = @dbexecdir@ dbexecdir = @dbexecdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
extra_ldflags_libjava = @extra_ldflags_libjava@ extra_ldflags_libjava = @extra_ldflags_libjava@
gxx_include_dir = @gxx_include_dir@ gxx_include_dir = @gxx_include_dir@
...@@ -269,7 +270,6 @@ host_cpu = @host_cpu@ ...@@ -269,7 +270,6 @@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
...@@ -277,16 +277,13 @@ libdir = @libdir@ ...@@ -277,16 +277,13 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
libstdcxx_incdir = @libstdcxx_incdir@ libstdcxx_incdir = @libstdcxx_incdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@ subdirs = @subdirs@
......
# Makefile.in generated by automake 1.9.3 from Makefile.am. # Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004 Free Software Foundation, Inc. # 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
...@@ -112,7 +112,6 @@ GCSPEC = @GCSPEC@ ...@@ -112,7 +112,6 @@ GCSPEC = @GCSPEC@
GCTESTSPEC = @GCTESTSPEC@ GCTESTSPEC = @GCTESTSPEC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTK_AWT_FALSE = @GTK_AWT_FALSE@ GTK_AWT_FALSE = @GTK_AWT_FALSE@
GTK_AWT_TRUE = @GTK_AWT_TRUE@ GTK_AWT_TRUE = @GTK_AWT_TRUE@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
...@@ -214,7 +213,6 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ ...@@ -214,7 +213,6 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
...@@ -223,8 +221,14 @@ ZINCS = @ZINCS@ ...@@ -223,8 +221,14 @@ ZINCS = @ZINCS@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
ac_ct_AR = @ac_ct_AR@
ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_GCJ = @ac_ct_GCJ@
ac_ct_LD = @ac_ct_LD@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
...@@ -244,10 +248,7 @@ build_os = @build_os@ ...@@ -244,10 +248,7 @@ build_os = @build_os@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
dbexecdir = @dbexecdir@ dbexecdir = @dbexecdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
extra_ldflags_libjava = @extra_ldflags_libjava@ extra_ldflags_libjava = @extra_ldflags_libjava@
gxx_include_dir = @gxx_include_dir@ gxx_include_dir = @gxx_include_dir@
...@@ -258,7 +259,6 @@ host_cpu = @host_cpu@ ...@@ -258,7 +259,6 @@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
...@@ -266,16 +266,13 @@ libdir = @libdir@ ...@@ -266,16 +266,13 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
libstdcxx_incdir = @libstdcxx_incdir@ libstdcxx_incdir = @libstdcxx_incdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@ subdirs = @subdirs@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment