2005-05-21 H.J. Lu <hongjiu.lu@intel.com>

	* Makefile.am (ld.1): Revert the last 2 changes.
	(info-recursive): Depend on ld.1.
	* Makefile.in: Regenerated.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2eebf31a3c4178487eb53e3086ca8ff5c1172164..ed4523dfaee09f8a48850d9ce8c078ddcb94b7eb 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * Makefile.am (ld.1): Revert the last 2 changes.
+       (info-recursive): Depend on ld.1.
+       * Makefile.in: Regenerated.
+
 2005-05-21  H.J. Lu  <hongjiu.lu@intel.com>
 
        * Makefile.am (ld.1): Depend on "info" instead of

diff --git a/ld/Makefile.am b/ld/Makefile.am
index b5b154b9e1469fd9427f08c141ff25b8e2c82a27..e8ec9c21961f92046d169c52f243cd778270e199 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1644,9 +1644,7 @@ ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
 # the man output looks standard.
-# It depends on "info" instead of "configdoc.texi ldver.texi" to
-# support parallel build.
-ld.1: $(srcdir)/ld.texinfo info
+ld.1: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
        touch $@
        -$(TEXI2POD) $(MANCONF) < $(srcdir)/ld.texinfo > ld.pod
        -($(POD2MAN) ld.pod | \
@@ -1701,6 +1699,11 @@ EXTRA_DIST = ldgram.c ldgram.h ldlex.c $(man_MANS)
 diststuff: info $(EXTRA_DIST)
 all: info ld.1
 
+# Both info (ld.info) and ld.1 depend on configdoc.texi and ldver.texi.
+# But info isn't a direct target. Make info-recursive to depend on
+# ld.1 to support parallel build.
+info-recursive: ld.1
+
 DISTCLEANFILES = tdirs site.exp site.bak stringify.sed
 distclean-local:
        rm -rf ldscripts

diff --git a/ld/Makefile.in b/ld/Makefile.in
index eec16c76b87ed58ed4d73577eb260d8a0bfae15f..8f972079a3e477f83d2255f343fb8182538a9077 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2437,9 +2437,7 @@ ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
 # the man output looks standard.
-# It depends on "info" instead of "configdoc.texi ldver.texi" to
-# support parallel build.
-ld.1: $(srcdir)/ld.texinfo info
+ld.1: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
        touch $@
        -$(TEXI2POD) $(MANCONF) < $(srcdir)/ld.texinfo > ld.pod
        -($(POD2MAN) ld.pod | \
@@ -2478,6 +2476,11 @@ install-data-local:
 install-data-local: install-info
 diststuff: info $(EXTRA_DIST)
 all: info ld.1
+
+# Both info (ld.info) and ld.1 depend on configdoc.texi and ldver.texi.
+# But info isn't a direct target. Make info-recursive to depend on
+# ld.1 to support parallel build.
+info-recursive: ld.1
 distclean-local:
        rm -rf ldscripts