diff options
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/Makefile.am | 9 | ||||
| -rw-r--r-- | ld/Makefile.in | 9 |
3 files changed, 18 insertions, 6 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 2eebf31..ed4523d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,11 @@ 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 "configdoc.texi ldver.texi". * Makefile.in: Regenerated. diff --git a/ld/Makefile.am b/ld/Makefile.am index b5b154b..e8ec9c2 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 eec16c7..8f97207 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 |