diff options
37 files changed, 269 insertions, 1155 deletions
diff --git a/ChangeLog b/ChangeLog index f6b9504bf7f..e9e3a763956 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * README-maintainer-mode: Point directly to upstream locations + for autoconf, automake, libtool, gettext, instead of copies on + sources.redhat.com. Document required versions. + * configure.ac: Do not substitute datarootdir, htmldir, + pdfdir, docdir. Do not process --with-datarootdir, + --with-htmldir, --with-pdfdir, --with-docdir. + * configure: Regenerate. + * configure: Regenerate. * compile: Sync from Automake 1.11. diff --git a/README-maintainer-mode b/README-maintainer-mode index 0115a1ee556..a350974a55d 100644 --- a/README-maintainer-mode +++ b/README-maintainer-mode @@ -3,7 +3,18 @@ Note that if you configure with --enable-maintainer-mode, you will need special versions of automake, autoconf, libtool and gettext. You will -find the sources for these in ftp://sources.redhat.com/pub/binutils. +find the sources for these in the respective upstream directories: + + ftp://ftp.gnu.org/gnu/autoconf + ftp://ftp.gnu.org/gnu/automake + ftp://ftp.gnu.org/gnu/libtool + ftp://ftp.gnu.org/gnu/gettext + +The required versions of the tools for this tree are + autoconf 2.64 + automake 1.11 + libtool 2.2.6 + gettext 0.14.5 Note - "make distclean" does not work with maintainer mode enabled. The Makefiles in the some of the po/ subdirectories depend upon the diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 086a436fe25..2d02b20170c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (datarootdir, docdir, htmldor, pdfdir) + (install-pdf, install-pdf-recursive, install-html) + (install-html-recursive): Remove. + * Makefile.in: Regenerate. + * Makefile.in: Regenerate. * aclocal.m4: Likewise. * config.in: Likewise. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 20fcf5a1ab9..2fe953a673b 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -16,11 +16,6 @@ bfddocdir = doc bfdlibdir = @bfdlibdir@ bfdincludedir = @bfdincludedir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -htmldir = @htmldir@ -pdfdir = @pdfdir@ - bfdlib_LTLIBRARIES = libbfd.la WARN_CFLAGS = @WARN_CFLAGS@ @@ -723,64 +718,6 @@ po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES) all diststuff: info -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -install-pdf: install-pdf-recursive - -install-pdf-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-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" - # Various kinds of .o files to put in libbfd.a: # BFD_BACKENDS Routines the configured targets need. # BFD_MACHINES Architecture-specific routines the configured targets need. diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 7c7335dba63..30a446230ff 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -1328,6 +1328,8 @@ install-dvi-am: install-exec-am: +install-html: install-html-recursive + install-html-am: install-info: install-info-recursive @@ -1336,6 +1338,8 @@ install-info-am: install-man: +install-pdf: install-pdf-recursive + install-pdf-am: install-ps: install-ps-recursive @@ -1398,64 +1402,6 @@ po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES) all diststuff: info -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -install-pdf: install-pdf-recursive - -install-pdf-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-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" - stamp-ofiles: Makefile rm -f tofiles f=""; \ diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog index 2a36ecb05ba..5df2abac0e7 100644 --- a/bfd/doc/ChangeLog +++ b/bfd/doc/ChangeLog @@ -1,5 +1,9 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) + (html__strip_dir, install-html, install-html-am): Remove. + * Makefile.in: Regenerate. + * Makefile.in: Regenerate. 2009-05-22 Alan Modra <amodra@bigpond.net.au> diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am index d5b3fbabae4..2a10fc0c75a 100644 --- a/bfd/doc/Makefile.am +++ b/bfd/doc/Makefile.am @@ -296,41 +296,6 @@ MAINTAINERCLEANFILES = $(DOCFILES) # cygnus option. install: install-info -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - -install-pdf: install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -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 - MAINTAINERCLEANFILES += bfd.info # Automake 1.9 will only build info files in the objdir if they are diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index 73b11106ee2..87346e2b04f 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -376,8 +376,6 @@ CLEANFILES = *.p *.ip DISTCLEANFILES = bfd.?? bfd.??? bfd.h libbfd.h libcoff.h texput.log \ $(am__append_1) MAINTAINERCLEANFILES = $(DOCFILES) bfd.info -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; all: all-am .SUFFIXES: @@ -634,6 +632,29 @@ install-dvi-am: $(DVIS) done install-exec-am: +install-html: install-html-am + +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ + $(am__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" || exit $$?; \ + else \ + list2="$$list2 $$d$$p"; \ + fi; \ + done; \ + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done; } install-info: install-info-am install-info-am: $(INFO_DEPS) @@ -669,6 +690,19 @@ install-info-am: $(INFO_DEPS) else : ; fi install-man: +install-pdf: install-pdf-am + +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done install-ps: install-ps-am install-ps-am: $(PSS) @@ -904,37 +938,6 @@ bfdver.texi: $(srcdir)/Makefile.in # cygnus option. install: install-info -install-pdf: install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -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 - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 17bc23cf243..d5cadb88ccc 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,12 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (install-pdf, install-pdf-recursive, install-html) + (install-html-recursive): Remove. + * Makefile.in: Regenerate. + * doc/Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) + (html__strip_dir, install-html, install-html-am): Remove. + * doc/Makefile.in: Regenerate. + * Makefile.in: Regenerate. * aclocal.m4: Likewise. * config.in: Likewise. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 636140d0a15..2d3871557bc 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -116,64 +116,6 @@ OPCODES = ../opcodes/libopcodes.la LIBIBERTY = ../libiberty/libiberty.a -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -install-pdf: install-pdf-recursive - -install-pdf-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-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" - POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES) po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index aaec5232387..9d80d22d426 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -972,6 +972,8 @@ install-dvi-am: install-exec-am: install-binPROGRAMS install-exec-local +install-html: install-html-recursive + install-html-am: install-info: install-info-recursive @@ -980,6 +982,8 @@ install-info-am: install-man: +install-pdf: install-pdf-recursive + install-pdf-am: install-ps: install-ps-recursive @@ -1029,64 +1033,6 @@ uninstall-am: uninstall-binPROGRAMS mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \ tags-recursive uninstall uninstall-am uninstall-binPROGRAMS - -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -install-pdf: install-pdf-recursive - -install-pdf-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-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" po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 71aa192768c..bdd470d2811 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -161,41 +161,6 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile # cygnus option. install-data-local: install-info -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - -install-pdf: install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -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 - MAINTAINERCLEANFILES = binutils.info # Automake 1.9 will only build info files in the objdir if they are diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 4351b673e10..f2d63c87faf 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -297,8 +297,6 @@ TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ -I "$(top_srcdir)/../bfd/doc" -I ../../bfd/doc MOSTLYCLEANFILES = $(DEMANGLER_NAME).1 -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; MAINTAINERCLEANFILES = binutils.info # Automake 1.9 will only build info files in the objdir if they are @@ -604,6 +602,29 @@ install-dvi-am: $(DVIS) done install-exec-am: +install-html: install-html-am + +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ + $(am__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" || exit $$?; \ + else \ + list2="$$list2 $$d$$p"; \ + fi; \ + done; \ + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done; } install-info: install-info-am install-info-am: $(INFO_DEPS) @@ -639,6 +660,19 @@ install-info-am: $(INFO_DEPS) else : ; fi install-man: install-man1 +install-pdf: install-pdf-am + +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done install-ps: install-ps-am install-ps-am: $(PSS) @@ -815,37 +849,6 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefile # cygnus option. install-data-local: install-info -install-pdf: install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -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/configure b/configure index 715915c6a63..0d149717b66 100755 --- a/configure +++ b/configure @@ -770,10 +770,6 @@ with_build_time_tools enable_maintainer_mode enable_stage1_checking enable_werror -with_datarootdir -with_docdir -with_pdfdir -with_htmldir ' ac_precious_vars='build_alias host_alias @@ -1500,10 +1496,6 @@ Optional Packages: map A to B, C to D ... in debug information --with-build-time-tools=PATH use given path to find target tools during the build - --with-datarootdir use datarootdir as the data root directory. - --with-docdir install documentation in this directory. - --with-pdfdir install pdf in this directory. - --with-htmldir install html in this directory. Some influential environment variables: CC C compiler command @@ -13187,48 +13179,6 @@ case ${enable_werror} in esac -# Flags needed to enable html installing and building - -# Check whether --with-datarootdir was given. -if test "${with_datarootdir+set}" = set; then : - withval=$with_datarootdir; datarootdir="\${prefix}/${withval}" -else - datarootdir="\${prefix}/share" -fi - - - -# Check whether --with-docdir was given. -if test "${with_docdir+set}" = set; then : - withval=$with_docdir; docdir="\${prefix}/${withval}" -else - docdir="\${datarootdir}/doc" -fi - - - -# Check whether --with-pdfdir was given. -if test "${with_pdfdir+set}" = set; then : - withval=$with_pdfdir; pdfdir="\${prefix}/${withval}" -else - pdfdir="\${docdir}" -fi - - - -# Check whether --with-htmldir was given. -if test "${with_htmldir+set}" = set; then : - withval=$with_htmldir; htmldir="\${prefix}/${withval}" -else - htmldir="\${docdir}" -fi - - - - - - - # Specify what files to not compare during bootstrap. compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*" diff --git a/configure.ac b/configure.ac index 9da0048969a..ad2c86a5a25 100644 --- a/configure.ac +++ b/configure.ac @@ -3120,32 +3120,6 @@ case ${enable_werror} in esac AC_SUBST(stage2_werror_flag) -# Flags needed to enable html installing and building -AC_ARG_WITH(datarootdir, -[ --with-datarootdir use datarootdir as the data root directory.], -[datarootdir="\${prefix}/${withval}"], -[datarootdir="\${prefix}/share"]) - -AC_ARG_WITH(docdir, -[ --with-docdir install documentation in this directory.], -[docdir="\${prefix}/${withval}"], -[docdir="\${datarootdir}/doc"]) - -AC_ARG_WITH(pdfdir, -[ --with-pdfdir install pdf in this directory.], -[pdfdir="\${prefix}/${withval}"], -[pdfdir="\${docdir}"]) - -AC_ARG_WITH(htmldir, -[ --with-htmldir install html in this directory.], -[htmldir="\${prefix}/${withval}"], -[htmldir="\${docdir}"]) - -AC_SUBST(datarootdir) -AC_SUBST(docdir) -AC_SUBST(pdfdir) -AC_SUBST(htmldir) - # Specify what files to not compare during bootstrap. compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*" diff --git a/gas/ChangeLog b/gas/ChangeLog index 3d2d92dcea9..b5e3ff5571f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,12 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (install-pdf, install-pdf-recursive, install-html) + (install-html-recursive): Remove. + * Makefile.in: Regenerate. + * doc/Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) + (html__strip_dir, install-html, install-html-am): Remove. + * doc/Makefile.in: Regenerate. + * Makefile.in: Regenerate. * aclocal.m4: Likewise. * config.in: Likewise. diff --git a/gas/Makefile.am b/gas/Makefile.am index 39cea06e591..a7f547cf438 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -728,64 +728,6 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core \ CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2A DEP1 DEPA DEP DEPDIR -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -install-pdf: install-pdf-recursive - -install-pdf-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-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 0f677e529d1..30876f91f3e 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -4825,6 +4825,8 @@ install-dvi-am: install-exec-am: install-exec-local +install-html: install-html-recursive + install-html-am: install-info: install-info-recursive @@ -4833,6 +4835,8 @@ install-info-am: install-man: +install-pdf: install-pdf-recursive + install-pdf-am: install-ps: install-ps-recursive @@ -5046,64 +5050,6 @@ 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-pdf install-pdf-am install-pdf-recursive - -install-pdf: install-pdf-recursive - -install-pdf-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-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/doc/Makefile.am b/gas/doc/Makefile.am index 1a91757b667..e00243c4c67 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -74,41 +74,6 @@ CPU_DOCS = \ # cygnus option. install-data-local: install-info -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - -install-pdf: install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -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 b37040d232f..74e3c91322a 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -308,8 +308,6 @@ CPU_DOCS = \ c-z80.texi \ c-z8k.texi -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -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 @@ -618,6 +616,29 @@ install-dvi-am: $(DVIS) done install-exec-am: +install-html: install-html-am + +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ + $(am__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" || exit $$?; \ + else \ + list2="$$list2 $$d$$p"; \ + fi; \ + done; \ + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done; } install-info: install-info-am install-info-am: $(INFO_DEPS) @@ -653,6 +674,19 @@ install-info-am: $(INFO_DEPS) else : ; fi install-man: install-man1 +install-pdf: install-pdf-am + +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done install-ps: install-ps-am install-ps-am: $(PSS) @@ -718,37 +752,6 @@ asconfig.texi: $(CONFIG).texi # cygnus option. install-data-local: install-info -install-pdf: install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -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/gdb/CONTRIBUTE b/gdb/CONTRIBUTE index 75b6ddf509c..2d24bba2ec6 100644 --- a/gdb/CONTRIBUTE +++ b/gdb/CONTRIBUTE @@ -121,7 +121,7 @@ o If ``gdb/configure.ac'' is modified then you don't ``configure''. The maintainer will re-generate those files - using autoconf (2.59 as of 2005-01-07). + using autoconf (2.64 as of 2009-08-22). o If ``gdb/gdbarch.sh'' is modified, you don't diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7b50f452b86..3901f180d49 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * CONTRIBUTE: Bump documented Autoconf version. + * configure.ac: Do not substitute datarootdir, htmldir, + pdfdir, docdir. Do not process --with-datarootdir, + --with-htmldir, --with-pdfdir, --with-docdir. + * configure: Regenerate. + * aclocal.m4: Regenerate. * config.in: Likewise. * configure: Likewise. diff --git a/gdb/configure b/gdb/configure index fa0861c29b5..2691e33a31b 100755 --- a/gdb/configure +++ b/gdb/configure @@ -912,10 +912,6 @@ with_tk with_x enable_sim enable_multi_ice -with_datarootdir -with_docdir -with_pdfdir -with_htmldir ' ac_precious_vars='build_alias host_alias @@ -1608,10 +1604,6 @@ Optional Packages: --with-tcl directory containing tcl configuration (tclConfig.sh) --with-tk directory containing tk configuration (tkConfig.sh) --with-x use the X Window System - --with-datarootdir use datarootdir as the data root directory. - --with-docdir install documentation in this directory. - --with-pdfdir install pdf in this directory. - --with-htmldir install html in this directory. Some influential environment variables: CC C compiler command @@ -14164,48 +14156,6 @@ ac_config_links="$ac_config_links $ac_config_links_1" $as_echo "#define GDB_DEFAULT_HOST_CHARSET \"UTF-8\"" >>confdefs.h -# Flags needed to enable html installing and building - -# Check whether --with-datarootdir was given. -if test "${with_datarootdir+set}" = set; then : - withval=$with_datarootdir; datarootdir="\${prefix}/${withval}" -else - datarootdir="\${prefix}/share" -fi - - - -# Check whether --with-docdir was given. -if test "${with_docdir+set}" = set; then : - withval=$with_docdir; docdir="\${prefix}/${withval}" -else - docdir="\${datarootdir}/doc" -fi - - - -# Check whether --with-pdfdir was given. -if test "${with_pdfdir+set}" = set; then : - withval=$with_pdfdir; pdfdir="\${prefix}/${withval}" -else - pdfdir="\${docdir}" -fi - - - -# Check whether --with-htmldir was given. -if test "${with_htmldir+set}" = set; then : - withval=$with_htmldir; htmldir="\${prefix}/${withval}" -else - htmldir="\${docdir}" -fi - - - - - - - ac_config_files="$ac_config_files Makefile .gdbinit:gdbinit.in gnulib/Makefile" ac_config_commands="$ac_config_commands default" diff --git a/gdb/configure.ac b/gdb/configure.ac index 9dc736cdbdb..aa0bf753e00 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1917,32 +1917,6 @@ dnl At the moment, we just assume it's UTF-8. AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8", [Define to be a string naming the default host character set.]) -# Flags needed to enable html installing and building -AC_ARG_WITH(datarootdir, -AC_HELP_STRING([--with-datarootdir], [use datarootdir as the data root directory.]), -[datarootdir="\${prefix}/${withval}"], -[datarootdir="\${prefix}/share"]) - -AC_ARG_WITH(docdir, -AC_HELP_STRING([--with-docdir], [install documentation in this directory.]), -[docdir="\${prefix}/${withval}"], -[docdir="\${datarootdir}/doc"]) - -AC_ARG_WITH(pdfdir, -AC_HELP_STRING([--with-pdfdir], [install pdf in this directory.]), -[pdfdir="\${prefix}/${withval}"], -[pdfdir="\${docdir}"]) - -AC_ARG_WITH(htmldir, -AC_HELP_STRING([--with-htmldir], [install html in this directory.]), -[htmldir="\${prefix}/${withval}"], -[htmldir="\${docdir}"]) - -AC_SUBST(datarootdir) -AC_SUBST(docdir) -AC_SUBST(htmldir) -AC_SUBST(pdfdir) - AC_OUTPUT(Makefile .gdbinit:gdbinit.in gnulib/Makefile, [ case x$CONFIG_HEADERS in diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index eeed9cff684..865967e0af2 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,5 +1,12 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * gdbint.texinfo (Releasing GDB): Point to + README-maintainer-mode file for required autoconf version. + * configure.ac: Do not substitute datarootdir, htmldir, + pdfdir, docdir. Do not process --with-datarootdir, + --with-htmldir, --with-pdfdir, --with-docdir. + * configure: Regenerate. + * configure: Regenerate. 2009-08-20 Reid Kleckner <reid@kleckner.net> diff --git a/gdb/doc/configure b/gdb/doc/configure index f89c140f6ae..7dc008d1b87 100755 --- a/gdb/doc/configure +++ b/gdb/doc/configure @@ -601,10 +601,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -with_datarootdir -with_docdir -with_pdfdir -with_htmldir with_pkgversion with_bugurl ' @@ -1218,10 +1214,6 @@ if test -n "$ac_init_help"; then Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-datarootdir use datarootdir as the data root directory. - --with-docdir install documentation in this directory. - --with-pdfdir install pdf in this directory. - --with-htmldir install html in this directory. --with-pkgversion=PKG Use PKG in the version string in place of "GDB" --with-bugurl=URL Direct users to URL to report a bug @@ -1884,48 +1876,6 @@ $as_echo "no, using $LN_S" >&6; } fi -# Flags needed to enable html installing and building - -# Check whether --with-datarootdir was given. -if test "${with_datarootdir+set}" = set; then : - withval=$with_datarootdir; datarootdir="\${prefix}/${withval}" -else - datarootdir="\${prefix}/share" -fi - - - -# Check whether --with-docdir was given. -if test "${with_docdir+set}" = set; then : - withval=$with_docdir; docdir="\${prefix}/${withval}" -else - docdir="\${datarootdir}/doc" -fi - - - -# Check whether --with-pdfdir was given. -if test "${with_pdfdir+set}" = set; then : - withval=$with_pdfdir; pdfdir="\${prefix}/${withval}" -else - pdfdir="\${docdir}" -fi - - - -# Check whether --with-htmldir was given. -if test "${with_htmldir+set}" = set; then : - withval=$with_htmldir; htmldir="\${prefix}/${withval}" -else - htmldir="\${docdir}" -fi - - - - - - - # Check whether --with-pkgversion was given. diff --git a/gdb/doc/configure.ac b/gdb/doc/configure.ac index b7a2b482b25..3baea748cc2 100644 --- a/gdb/doc/configure.ac +++ b/gdb/doc/configure.ac @@ -4,32 +4,6 @@ sinclude(../../config/acx.m4) AC_PROG_INSTALL AC_PROG_LN_S -# Flags needed to enable html installing and building -AC_ARG_WITH(datarootdir, -AC_HELP_STRING([--with-datarootdir], [use datarootdir as the data root directory.]), -[datarootdir="\${prefix}/${withval}"], -[datarootdir="\${prefix}/share"]) - -AC_ARG_WITH(docdir, -AC_HELP_STRING([--with-docdir], [install documentation in this directory.]), -[docdir="\${prefix}/${withval}"], -[docdir="\${datarootdir}/doc"]) - -AC_ARG_WITH(pdfdir, -AC_HELP_STRING([--with-pdfdir], [install pdf in this directory.]), -[pdfdir="\${prefix}/${withval}"], -[pdfdir="\${docdir}"]) - -AC_ARG_WITH(htmldir, -AC_HELP_STRING([--with-htmldir], [install html in this directory.]), -[htmldir="\${prefix}/${withval}"], -[htmldir="\${docdir}"]) - -AC_SUBST(datarootdir) -AC_SUBST(docdir) -AC_SUBST(htmldir) -AC_SUBST(pdfdir) - ACX_PKGVERSION([GDB]) ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/]) AC_OUTPUT(Makefile) diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index b1c045218b4..6d0a22640a1 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -7078,10 +7078,9 @@ Notes: @itemize @bullet @item Check the @code{autoconf} version carefully. You want to be using the -version taken from the @file{binutils} snapshot directory, which can be -found at @uref{ftp://sourceware.org/pub/binutils/}. It is very -unlikely that a system installed version of @code{autoconf} (e.g., -@file{/usr/bin/autoconf}) is correct. +version documented in the toplevel @file{README-maintainer-mode} file. +It is very unlikely that a system installed version of @code{autoconf} +(e.g., @file{/usr/bin/autoconf}) is correct. @end itemize @subsubheading Check out the relevant modules: diff --git a/gprof/ChangeLog b/gprof/ChangeLog index a7e2deeea13..05f5e0a1787 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,5 +1,10 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) + (install-pdf-recursive, html__strip_dir, install-html) + (install-html-am, install-html-recursive): Remove. + * Makefile.in: Regenerate. + * Makefile.in: Regenerate. * aclocal.m4: Likewise. * configure: Likewise. diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 12d794beedb..6c73106657e 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -83,95 +83,6 @@ gprof.1: $(srcdir)/gprof.texi config.texi (rm -f $@.T$$$$ && exit 1) rm -f gprof.pod -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - -install-pdf: install-pdf-recursive install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -install-pdf-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-html install-html-am install-html-recursive - -html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - -install-html: install-html-recursive 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 - -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" - # We want install to imply install-info as per GNU standards, despite the # cygnus option. install-data-local: install-info diff --git a/gprof/Makefile.in b/gprof/Makefile.in index ba684bfcd24..f91ee0cbf82 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -310,8 +310,6 @@ gprof_TEXINFOS = config.texi man_MANS = gprof.1 AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc TEXI2DVI = texi2dvi -I "$(srcdir)" -I "$(top_srcdir)/../bfd/doc" -I ../bfd/doc -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 MAINTAINERCLEANFILES = gprof.info @@ -841,6 +839,29 @@ install-dvi-am: $(DVIS) done install-exec-am: install-binPROGRAMS +install-html: install-html-recursive + +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ + $(am__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" || exit $$?; \ + else \ + list2="$$list2 $$d$$p"; \ + fi; \ + done; \ + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done; } install-info: install-info-recursive install-info-am: $(INFO_DEPS) @@ -876,6 +897,19 @@ install-info-am: $(INFO_DEPS) else : ; fi install-man: install-man1 +install-pdf: install-pdf-recursive + +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done install-ps: install-ps-recursive install-ps-am: $(PSS) @@ -970,91 +1004,6 @@ gprof.1: $(srcdir)/gprof.texi config.texi (rm -f $@.T$$$$ && exit 1) rm -f gprof.pod -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -install-pdf: install-pdf-recursive install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -install-pdf-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-html install-html-am install-html-recursive - -install-html: install-html-recursive 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 - -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" - # We want install to imply install-info as per GNU standards, despite the # cygnus option. install-data-local: install-info diff --git a/ld/ChangeLog b/ld/ChangeLog index 1defb38b156..9ee58951dfe 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) + (install-pdf-recursive, html__strip_dir, install-html) + (install-html-am, install-html-recursive): Remove. + * Makefile.in: Regenerate. + * Makefile.in: Regenerate. * aclocal.m4: Likewise. * config.in: Likewise. diff --git a/ld/Makefile.am b/ld/Makefile.am index 785966d868b..fc4a47ebb51 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -1880,95 +1880,6 @@ mostlyclean-local: -rm -rf tmpdir CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 spu_ovl.s spu_ovl.o spu_icache.s spu_icache.o -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - -install-pdf: install-pdf-recursive install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -install-pdf-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-html install-html-am install-html-recursive - -html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - -install-html: install-html-recursive 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 - -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 install-exec-local: ld-new$(EXEEXT) diff --git a/ld/Makefile.in b/ld/Makefile.in index 0f6a10377f8..c51df4698d5 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -769,8 +769,6 @@ MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ ldemul-list.h crtbegin.o crtend.o ld.log ld.sum CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 spu_ovl.s spu_ovl.o spu_icache.s spu_icache.o -pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; # Stuff that should be included in a distribution. The diststuff # target is run by the taz target in ../Makefile.in. @@ -1311,6 +1309,29 @@ install-dvi-am: $(DVIS) done install-exec-am: install-exec-local +install-html: install-html-recursive + +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ + $(am__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" || exit $$?; \ + else \ + list2="$$list2 $$d$$p"; \ + fi; \ + done; \ + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done; } install-info: install-info-recursive install-info-am: $(INFO_DEPS) @@ -1346,6 +1367,19 @@ install-info-am: $(INFO_DEPS) else : ; fi install-man: install-man1 +install-pdf: install-pdf-recursive + +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done install-ps: install-ps-recursive install-ps-am: $(PSS) @@ -2800,91 +2834,6 @@ ld.1: $(srcdir)/ld.texinfo configdoc.texi mostlyclean-local: -rm -rf tmpdir -.PHONY: install-pdf install-pdf-am install-pdf-recursive - -install-pdf: install-pdf-recursive install-pdf-am - -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(pdf__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -install-pdf-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-html install-html-am install-html-recursive - -install-html: install-html-recursive 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 - -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 install-exec-local: ld-new$(EXEEXT) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 7ca54874ada..cfdede862ba 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,8 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (install-pdf, install-html): Remove. + * Makefile.in: Regenerate. + * Makefile.in: Regenerate. * aclocal.m4: Likewise. * config.in: Likewise. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 077a9da3114..88b025ff190 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -16,12 +16,6 @@ AM_CFLAGS = $(WARN_CFLAGS) bfdlibdir = @bfdlibdir@ bfdincludedir = @bfdincludedir@ -.PHONY: install-pdf -install-pdf: - -.PHONY: install-html -install-html: - bfdlib_LTLIBRARIES = libopcodes.la # This is where bfd.h lives. diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 978cb8f5446..f352e6bd7a3 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -995,6 +995,8 @@ install-dvi-am: install-exec-am: +install-html: install-html-recursive + install-html-am: install-info: install-info-recursive @@ -1003,6 +1005,8 @@ install-info-am: install-man: +install-pdf: install-pdf-recursive + install-pdf-am: install-ps: install-ps-recursive @@ -1053,12 +1057,6 @@ uninstall-am: uninstall-bfdlibLTLIBRARIES uninstall-bfdlibLTLIBRARIES -.PHONY: install-pdf -install-pdf: - -.PHONY: install-html -install-html: - disassemble.lo: disassemble.c $(INCDIR)/dis-asm.h $(LIBTOOL) --mode=compile $(COMPILE) -c @archdefs@ $(srcdir)/disassemble.c |