This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: PR ld/10536: Incorrect install-pdf/install-html
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: gcc-patches at gcc dot gnu dot org, binutils at sources dot redhat dot com
- Date: Tue, 18 Aug 2009 12:36:23 -0700
- Subject: PATCH: PR ld/10536: Incorrect install-pdf/install-html
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Hi,
We only need recursive install-pdf/install-html if there is a
subdirectory which contains pdf/html files. Tested with
# make -j8 install-pdf install-html
on Linux/Core i7. OK to install?
Thanks.
H.J.
---
gprof/
2009-08-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/10536
* Makefile.am (install-pdf-recursive): Removed.
(install-html-recursive): Likewise.
* Makefile.in: Regenerated.
ld/
2009-08-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/10536
* Makefile.am (install-pdf-recursive): Removed.
(install-html-recursive): Likewise.
* Makefile.in: Regenerated.
libiberty/
2009-08-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/10536
* Makefile.in (install-html-recursive): Removed.
Index: ld/Makefile.in
===================================================================
--- ld/Makefile.in (revision 6555)
+++ ld/Makefile.in (working copy)
@@ -768,15 +768,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+ cd $(srcdir) && $(AUTOMAKE) --cygnus \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ $(AUTOMAKE) --cygnus Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -2705,9 +2705,9 @@ ld.1: $(srcdir)/ld.texinfo configdoc.tex
mostlyclean-local:
-rm -rf tmpdir
-.PHONY: install-pdf install-pdf-am install-pdf-recursive
+.PHONY: install-pdf install-pdf-am
-install-pdf: install-pdf-recursive install-pdf-am
+install-pdf: install-pdf-am
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
@@ -2719,34 +2719,9 @@ install-pdf-am: $(PDFS)
$(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
+.PHONY: install-html install-html-am
-install-html: install-html-recursive install-html-am
+install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
@@ -2765,31 +2740,6 @@ install-html-am: $(HTMLS)
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)
Index: ld/Makefile.am
===================================================================
--- ld/Makefile.am (revision 6555)
+++ ld/Makefile.am (working copy)
@@ -1880,11 +1880,11 @@ 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
+.PHONY: install-pdf install-pdf-am
pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-install-pdf: install-pdf-recursive install-pdf-am
+install-pdf: install-pdf-am
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
@@ -1896,36 +1896,11 @@ install-pdf-am: $(PDFS)
$(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
+.PHONY: install-html install-html-am
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-install-html: install-html-recursive install-html-am
+install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
@@ -1944,31 +1919,6 @@ install-html-am: $(HTMLS)
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)
Index: libiberty/Makefile.in
===================================================================
--- libiberty/Makefile.in (revision 6555)
+++ libiberty/Makefile.in (working copy)
@@ -264,14 +264,14 @@ HTMLS = libiberty.html
html: $(HTMLS)
-.PHONY: install-html install-html-am install-html-recursive
+.PHONY: install-html install-html-am
NORMAL_INSTALL = :
mkdir_p = mkdir -p --
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-install-html: install-html-recursive install-html-am
+install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
@@ -290,31 +290,6 @@ install-html-am: $(HTMLS)
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"
-
TEXISRC = \
$(srcdir)/libiberty.texi \
$(srcdir)/copying-lib.texi \
Index: gprof/Makefile.in
===================================================================
--- gprof/Makefile.in (revision 6555)
+++ gprof/Makefile.in (working copy)
@@ -311,15 +311,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+ cd $(srcdir) && $(AUTOMAKE) --cygnus \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ $(AUTOMAKE) --cygnus Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -859,9 +859,9 @@ gprof.1: $(srcdir)/gprof.texi config.tex
(rm -f $@.T$$$$ && exit 1)
rm -f gprof.pod
-.PHONY: install-pdf install-pdf-am install-pdf-recursive
+.PHONY: install-pdf install-pdf-am
-install-pdf: install-pdf-recursive install-pdf-am
+install-pdf: install-pdf-am
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
@@ -873,34 +873,9 @@ install-pdf-am: $(PDFS)
$(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
+.PHONY: install-html install-html-am
-install-html: install-html-recursive install-html-am
+install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
@@ -919,31 +894,6 @@ install-html-am: $(HTMLS)
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
Index: gprof/Makefile.am
===================================================================
--- gprof/Makefile.am (revision 6555)
+++ gprof/Makefile.am (working copy)
@@ -83,11 +83,11 @@ gprof.1: $(srcdir)/gprof.texi config.tex
(rm -f $@.T$$$$ && exit 1)
rm -f gprof.pod
-.PHONY: install-pdf install-pdf-am install-pdf-recursive
+.PHONY: install-pdf install-pdf-am
pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-install-pdf: install-pdf-recursive install-pdf-am
+install-pdf: install-pdf-am
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
@@ -99,36 +99,11 @@ install-pdf-am: $(PDFS)
$(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
+.PHONY: install-html install-html-am
html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-install-html: install-html-recursive install-html-am
+install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
@@ -147,31 +122,6 @@ install-html-am: $(HTMLS)
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