From 108a6f8eb48006339bcb9d35cc5ae631bbd36df3 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Thu, 6 Apr 2006 21:49:35 +0000 Subject: 2006-04-06 Carlos O'Donell * Makefile.tpl: Add install-html target. * Makefile.def: Add install-html target. * Makefile.in: Regenerate. * configure.in: Add --with-datarootdir, --with-docdir, and --with-htmldir options. * configure: Regenerate. bfd/ 2006-04-06 Carlos O'Donell * po/Make-in: Add install-html target. * Makefile.am: Rename docdir to bfddocdir. Add datarootdir, docdir htmldir. Add install-html and install-html-recursive targets. * Makefile.in: Regenerate. * configure.in: AC_SUBST for datarootdir, docdir and htmldir. * configure: Regenerate. bfd/doc/ 2006-04-06 Carlos O'Donell * Makefile.am: Add install-html and install-html-am targets. Define datarootdir, docdir and htmldir. * Makefile.in: Regenerate. binutils/ 2006-04-06 Carlos O'Donell * po/Make-in: Add install-html target. * Makefile.am: Add install-html and install-html-recursive targets. * Makefile.in: Regenerate. * configure.in: AC_SUBST datarootdir, docdir and htmldir. * configure: Regenerate. * doc/Makefile.am: Add install-html and install-html-am targets. * doc/Makefile.in: Regenerate. etc/ 2006-04-06 Carlos O'Donell * Makefile.in: Add install-html target. Add htmldir, docdir and datarootdir. * configure.texi: Document install-html target. * configure.in: AC_SUBST datarootdir, docdir, htmldir. * configure: Regenerate. gas/ 2006-04-06 Carlos O'Donell * po/Make-in: Add install-html target. * Makefile.am: Add install-html and install-html-recursive targets. * Makefile.in: Regenerate. * configure.in: AC_SUBST datarootdir, docdir, htmldir. * configure: Regenerate. * doc/Makefile.am: Add install-html and install-html-am targets. * doc/Makefile.in: Regenerate. gprof/ 2006-04-06 Carlos O'Donell * po/Make-in: Add install-html target. * Makefile.am: Add install-html, install-html-am and install-html-recursive targets. * Makefile.in: Regenerate. * configure.in: AC_SUBST datarootdir, docdir, htmldir. * configure: Regenerate. intl/ 2006-04-06 Carlos O'Donell * intl/Makefile.in: Add html info and dvi and install-html to .PHONY Add install-html target. ld/ 2006-04-06 Carlos O'Donell * Makefile.am: Add install-html, install-html-am, and install-html-recursive targets. * Makefile.in: Regenerate. * configure.in: AC_SUBST datarootdir, docdir, htmldir. * configure: Regenerate. * po/Make-in: Add install-html target. opcodes/ 2006-04-06 Carlos O'Donell * Makefile.am: Add install-html target. * Makefile.in: Regenerate. --- gas/ChangeLog | 10 ++++++++++ gas/Makefile.am | 29 +++++++++++++++++++++++++++++ gas/Makefile.in | 32 ++++++++++++++++++++++++++++++++ gas/configure | 11 +++++++++-- gas/configure.in | 5 +++++ gas/doc/Makefile.am | 21 +++++++++++++++++++++ gas/doc/Makefile.in | 23 +++++++++++++++++++++++ gas/po/Make-in | 3 ++- 8 files changed, 131 insertions(+), 3 deletions(-) (limited to 'gas') diff --git a/gas/ChangeLog b/gas/ChangeLog index 455d441..f3a22a3 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2006-04-06 Carlos O'Donell + + * po/Make-in: Add install-html target. + * Makefile.am: Add install-html and install-html-recursive targets. + * Makefile.in: Regenerate. + * configure.in: AC_SUBST datarootdir, docdir, htmldir. + * configure: Regenerate. + * doc/Makefile.am: Add install-html and install-html-am targets. + * doc/Makefile.in: Regenerate. + 2006-04-06 Alan Modra * frags.c (frag_offset_fixed_p): Reinitialise offset before diff --git a/gas/Makefile.am b/gas/Makefile.am index 525ebbb..08b9842 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -672,6 +672,35 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core \ CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2A DEP1 DEPA DEP DEPDIR +.PHONY: install-html install-html-am install-html-recursive + +install-html: install-html-recursive + +install-html-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + .PHONY: install-exec-local install-data-local .PHONY: install-exec-bindir install-exec-tooldir diff --git a/gas/Makefile.in b/gas/Makefile.in index fc2b9b4..3eeed7f 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -213,6 +213,8 @@ build_os = @build_os@ build_vendor = @build_vendor@ cgen_cpu_prefix = @cgen_cpu_prefix@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ exec_prefix = @exec_prefix@ extra_objects = @extra_objects@ host = @host@ @@ -220,6 +222,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -3010,6 +3013,35 @@ cgen.o: cgen.c cgen.h cgen-desc.h subsegs.h \ $(srcdir)/../opcodes/$(CGEN_CPU_PREFIX)-desc.h \ $(srcdir)/../opcodes/$(CGEN_CPU_PREFIX)-opc.h +.PHONY: install-html install-html-am install-html-recursive + +install-html: install-html-recursive + +install-html-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + .PHONY: install-exec-local install-data-local .PHONY: install-exec-bindir install-exec-tooldir diff --git a/gas/configure b/gas/configure index 1a2298f..dca6497 100755 --- a/gas/configure +++ b/gas/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL WARN_CFLAGS NO_WERROR GDBINIT cgen_cpu_prefix extra_objects target_cpu_type obj_format te_file install_tooldir atof BFDLIB OPCODES_LIB BFDVER_H ALL_OBJ_DEPS YACC LEX LEXLIB LEX_OUTPUT_ROOT CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBM LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL WARN_CFLAGS NO_WERROR GDBINIT cgen_cpu_prefix extra_objects target_cpu_type obj_format te_file install_tooldir atof BFDLIB OPCODES_LIB BFDVER_H ALL_OBJ_DEPS YACC LEX LEXLIB LEX_OUTPUT_ROOT CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBM datarootdir docdir htmldir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -856,7 +856,7 @@ Optional Features: --enable-static=PKGS build static libraries default=yes --enable-fast-install=PKGS optimize for fast installation default=yes --disable-libtool-lock avoid locking (might break parallel builds) - --enable-targets alternative target configurations besides the primary + --enable-targets alternative target configurations besides the primary --enable-commonbfdlib build shared BFD/opcodes/libiberty library --enable-werror treat compile warnings as errors --enable-build-warnings Enable build-time compiler warnings @@ -11125,6 +11125,10 @@ fi + + + + ac_config_files="$ac_config_files Makefile doc/Makefile po/Makefile.in:po/Make-in" ac_config_commands="$ac_config_commands default" @@ -11882,6 +11886,9 @@ s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t s,@LIBM@,$LIBM,;t t +s,@datarootdir@,$datarootdir,;t t +s,@docdir@,$docdir,;t t +s,@htmldir@,$htmldir,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/gas/configure.in b/gas/configure.in index 3ced026..fe69a51 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -669,6 +669,11 @@ GAS_CHECK_DECL_NEEDED(strstr, f, char *(*f)(), $gas_test_headers) AC_CHECK_DECLS([vsnprintf]) +dnl Required for html and install-html targets. +AC_SUBST(datarootdir) +AC_SUBST(docdir) +AC_SUBST(htmldir) + dnl This must come last. dnl We used to make symlinks to files in the source directory, but now diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index e564a25..cc806ca 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -70,6 +70,27 @@ $(srcdir)/as.info as.dvi as.html: $(srcdir)/as.texinfo asconfig.texi gasver.texi # cygnus option. install-data-local: install-info +html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + +install-html: install-html-am + +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \ + f=$(html__strip_dir) \ + if test -d "$$d$$p"; then \ + echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \ + else \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + fi; \ + done + # This one isn't ready for prime time yet. Not even a little bit. noinst_TEXINFOS = internals.texi diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 295835a..687e472 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -170,6 +170,8 @@ build_os = @build_os@ build_vendor = @build_vendor@ cgen_cpu_prefix = @cgen_cpu_prefix@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ exec_prefix = @exec_prefix@ extra_objects = @extra_objects@ host = @host@ @@ -177,6 +179,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -250,6 +253,7 @@ CPU_DOCS = \ c-z80.texi \ c-z8k.texi +html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; # This one isn't ready for prime time yet. Not even a little bit. noinst_TEXINFOS = internals.texi @@ -594,6 +598,25 @@ $(srcdir)/as.info as.dvi as.html: $(srcdir)/as.texinfo asconfig.texi gasver.texi # cygnus option. install-data-local: install-info +install-html: install-html-am + +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \ + f=$(html__strip_dir) \ + if test -d "$$d$$p"; then \ + echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \ + else \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + fi; \ + done + # Maintenance # We need it for the taz target in ../../Makefile.in. diff --git a/gas/po/Make-in b/gas/po/Make-in index 77f21f1..8a72671 100644 --- a/gas/po/Make-in +++ b/gas/po/Make-in @@ -1,6 +1,6 @@ # Makefile for program source directory in GNU NLS utilities package. # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper -# Copyright 2003 Free Software Foundation, Inc. +# Copyright 2003, 2006 Free Software Foundation, Inc. # # This file may be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License @@ -110,6 +110,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot install: install-exec install-data install-exec: install-info: +install-html: install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all -- cgit v1.1