From: H.J. Lu <hjl.tools@gmail.com>
Date: Sat, 21 May 2005 23:43:59 +0000 (+0000)
Subject: 2005-05-21  H.J. Lu  <hongjiu.lu@intel.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b8036013c936858753a662f81c2c3d825ceb4df;p=binutils-gdb.git

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 2eebf31a3c4..ed4523dfaee 100644
--- 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 b5b154b9e14..e8ec9c21961 100644
--- 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 eec16c76b87..8f972079a3e 100644
--- 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