* PATCH: PR ld/10536: Incorrect install-pdf/install-html
@ 2009-08-18 19:45 H.J. Lu
2009-08-18 19:52 ` Ralf Wildenhues
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: H.J. Lu @ 2009-08-18 19:45 UTC (permalink / raw)
To: gcc-patches, binutils
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: PR ld/10536: Incorrect install-pdf/install-html
2009-08-18 19:45 PATCH: PR ld/10536: Incorrect install-pdf/install-html H.J. Lu
@ 2009-08-18 19:52 ` Ralf Wildenhues
2009-08-18 19:58 ` H.J. Lu
2009-08-18 20:27 ` Tom Tromey
2009-08-19 2:38 ` Dave Korn
2 siblings, 1 reply; 9+ messages in thread
From: Ralf Wildenhues @ 2009-08-18 19:52 UTC (permalink / raw)
To: H.J. Lu; +Cc: gcc-patches, binutils
* H.J. Lu wrote on Tue, Aug 18, 2009 at 09:36:23PM CEST:
> 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?
Please see this proposed patch set which will obsolete your patch:
<http://thread.gmane.org/gmane.comp.gnu.binutils/42947/focus=26464>
as part of the move to Autoconf 2.64, Automake 1.11
Thanks,
Ralf
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: PR ld/10536: Incorrect install-pdf/install-html
2009-08-18 19:52 ` Ralf Wildenhues
@ 2009-08-18 19:58 ` H.J. Lu
2009-08-18 19:59 ` Ralf Wildenhues
0 siblings, 1 reply; 9+ messages in thread
From: H.J. Lu @ 2009-08-18 19:58 UTC (permalink / raw)
To: Ralf Wildenhues, gcc-patches, binutils
On Tue, Aug 18, 2009 at 12:40 PM, Ralf Wildenhues<Ralf.Wildenhues@gmx.de> wrote:
> * H.J. Lu wrote on Tue, Aug 18, 2009 at 09:36:23PM CEST:
>> 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?
>
> Please see this proposed patch set which will obsolete your patch:
> <http://thread.gmane.org/gmane.comp.gnu.binutils/42947/focus=26464>
> as part of the move to Autoconf 2.64, Automake 1.11
>
Does your patch cover libiberty?
Thanks.
--
H.J.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: PR ld/10536: Incorrect install-pdf/install-html
2009-08-18 19:58 ` H.J. Lu
@ 2009-08-18 19:59 ` Ralf Wildenhues
2009-08-18 21:23 ` Paolo Bonzini
0 siblings, 1 reply; 9+ messages in thread
From: Ralf Wildenhues @ 2009-08-18 19:59 UTC (permalink / raw)
To: H.J. Lu; +Cc: gcc-patches, binutils
* H.J. Lu wrote on Tue, Aug 18, 2009 at 09:44:50PM CEST:
> On Tue, Aug 18, 2009 at 12:40 PM, Ralf Wildenhues wrote:
> > * H.J. Lu wrote on Tue, Aug 18, 2009 at 09:36:23PM CEST:
> >
> > Please see this proposed patch set which will obsolete your patch:
> > <http://thread.gmane.org/gmane.comp.gnu.binutils/42947/focus=26464>
> > as part of the move to Autoconf 2.64, Automake 1.11
>
> Does your patch cover libiberty?
Yes. My plan is to update all that is contained in the GCC and
binutils plus gdb trees at once; and look at the other packages
that have their main home in src about what to do after that; see
<http://thread.gmane.org/gmane.comp.gnu.binutils/42947/focus=43065>
for which directories exactly are in that second list.
Cheers,
Ralf
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: PR ld/10536: Incorrect install-pdf/install-html
2009-08-18 19:45 PATCH: PR ld/10536: Incorrect install-pdf/install-html H.J. Lu
2009-08-18 19:52 ` Ralf Wildenhues
@ 2009-08-18 20:27 ` Tom Tromey
2009-08-19 2:38 ` Dave Korn
2 siblings, 0 replies; 9+ messages in thread
From: Tom Tromey @ 2009-08-18 20:27 UTC (permalink / raw)
To: H.J. Lu; +Cc: gcc-patches, binutils
>>>>> "HJ" == H J Lu <hongjiu.lu@intel.com> writes:
HJ> We only need recursive install-pdf/install-html if there is a
HJ> subdirectory which contains pdf/html files. Tested with
HJ> # make -j8 install-pdf install-html
HJ> on Linux/Core i7. OK to install?
How does this interact with Ralf's changes?
I think it would be preferable to wait until all his work has gone in
before making any other changes in this area.
Tom
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: PR ld/10536: Incorrect install-pdf/install-html
2009-08-18 19:59 ` Ralf Wildenhues
@ 2009-08-18 21:23 ` Paolo Bonzini
2009-08-23 9:41 ` H.J. Lu
0 siblings, 1 reply; 9+ messages in thread
From: Paolo Bonzini @ 2009-08-18 21:23 UTC (permalink / raw)
To: Ralf Wildenhues, H.J. Lu, gcc-patches, binutils
On 08/18/2009 09:52 PM, Ralf Wildenhues wrote:
> * H.J. Lu wrote on Tue, Aug 18, 2009 at 09:44:50PM CEST:
>> On Tue, Aug 18, 2009 at 12:40 PM, Ralf Wildenhues wrote:
>>> * H.J. Lu wrote on Tue, Aug 18, 2009 at 09:36:23PM CEST:
>>>
>>> Please see this proposed patch set which will obsolete your patch:
>>> <http://thread.gmane.org/gmane.comp.gnu.binutils/42947/focus=26464>
>>> as part of the move to Autoconf 2.64, Automake 1.11
>>
>> Does your patch cover libiberty?
>
> Yes. My plan is to update all that is contained in the GCC and
> binutils plus gdb trees at once; and look at the other packages
> that have their main home in src about what to do after that; see
> <http://thread.gmane.org/gmane.comp.gnu.binutils/42947/focus=43065>
> for which directories exactly are in that second list.
I think he meant that libiberty does not use automake. The libiberty
patch looks fine, but is _not_ approved until libiberty has switched to
Autoconf 2.64. Please resubmit later. The other parts will be obsolete.
Paolo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: PR ld/10536: Incorrect install-pdf/install-html
2009-08-18 19:45 PATCH: PR ld/10536: Incorrect install-pdf/install-html H.J. Lu
2009-08-18 19:52 ` Ralf Wildenhues
2009-08-18 20:27 ` Tom Tromey
@ 2009-08-19 2:38 ` Dave Korn
2 siblings, 0 replies; 9+ messages in thread
From: Dave Korn @ 2009-08-19 2:38 UTC (permalink / raw)
To: H.J. Lu; +Cc: gcc-patches, binutils
H.J. Lu wrote:
> 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
Was that regenerated right? I think those "--foreign" -> "--cygnus" changes
might be unintended?
cheers,
DaveK
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: PR ld/10536: Incorrect install-pdf/install-html
2009-08-18 21:23 ` Paolo Bonzini
@ 2009-08-23 9:41 ` H.J. Lu
2009-08-23 14:04 ` Paolo Bonzini
0 siblings, 1 reply; 9+ messages in thread
From: H.J. Lu @ 2009-08-23 9:41 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Ralf Wildenhues, gcc-patches, binutils
[-- Attachment #1: Type: text/plain, Size: 1384 bytes --]
On Tue, Aug 18, 2009 at 1:27 PM, Paolo Bonzini<bonzini@gnu.org> wrote:
> On 08/18/2009 09:52 PM, Ralf Wildenhues wrote:
>>
>> * H.J. Lu wrote on Tue, Aug 18, 2009 at 09:44:50PM CEST:
>>>
>>> On Tue, Aug 18, 2009 at 12:40 PM, Ralf Wildenhues wrote:
>>>>
>>>> * H.J. Lu wrote on Tue, Aug 18, 2009 at 09:36:23PM CEST:
>>>>
>>>> Please see this proposed patch set which will obsolete your patch:
>>>> <http://thread.gmane.org/gmane.comp.gnu.binutils/42947/focus=26464>
>>>> as part of the move to Autoconf 2.64, Automake 1.11
>>>
>>> Does your patch cover libiberty?
>>
>> Yes. My plan is to update all that is contained in the GCC and
>> binutils plus gdb trees at once; and look at the other packages
>> that have their main home in src about what to do after that; see
>> <http://thread.gmane.org/gmane.comp.gnu.binutils/42947/focus=43065>
>> for which directories exactly are in that second list.
>
> I think he meant that libiberty does not use automake. The libiberty patch
> looks fine, but is _not_ approved until libiberty has switched to Autoconf
> 2.64. Please resubmit later. The other parts will be obsolete.
>
> Paolo
>
Hi,
Here is the patch for libiberty. OK for gcc and src?
Thanks.
--
H.J.
---
libiberty/
2009-08-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/10536
* Makefile.in (install-html-recursive): Removed.
[-- Attachment #2: binutils-install-2.patch --]
[-- Type: application/octet-stream, Size: 1535 bytes --]
libiberty/
2009-08-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/10536
* Makefile.in (install-html-recursive): Removed.
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 \
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: PATCH: PR ld/10536: Incorrect install-pdf/install-html
2009-08-23 9:41 ` H.J. Lu
@ 2009-08-23 14:04 ` Paolo Bonzini
0 siblings, 0 replies; 9+ messages in thread
From: Paolo Bonzini @ 2009-08-23 14:04 UTC (permalink / raw)
To: H.J. Lu; +Cc: Ralf Wildenhues, gcc-patches, binutils
> Here is the patch for libiberty. OK for gcc and src?
Ok, thanks.
Paolo
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-08-23 13:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-18 19:45 PATCH: PR ld/10536: Incorrect install-pdf/install-html H.J. Lu
2009-08-18 19:52 ` Ralf Wildenhues
2009-08-18 19:58 ` H.J. Lu
2009-08-18 19:59 ` Ralf Wildenhues
2009-08-18 21:23 ` Paolo Bonzini
2009-08-23 9:41 ` H.J. Lu
2009-08-23 14:04 ` Paolo Bonzini
2009-08-18 20:27 ` Tom Tromey
2009-08-19 2:38 ` Dave Korn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).