From: Akim Demaille Date: Mon, 5 Mar 2001 14:44:26 +0000 (+0000) Subject: * automake.in (%required_targets, %dependencies): Add dvi, info, X-Git-Tag: handle-languages~180 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=3b3d9f0dc20cd62169eb7c52b74ba4819cfd62f1;p=automake.git * automake.in (%required_targets, %dependencies): Add dvi, info, dvi-am, info-am. (@info, @dvi): Remove. (&handle_texinfo, &handle_merge_targets): Adjust. (&handle_factored_dependencies): Required targets are phony. * texinfos.am: Build info, dvi, and the corresponding -am or -recursive targets. --- diff --git a/ChangeLog b/ChangeLog index 8aa7808d..36b0235f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-03-05 Akim Demaille + + * automake.in (%required_targets, %dependencies): Add dvi, info, + dvi-am, info-am. + (@info, @dvi): Remove. + (&handle_texinfo, &handle_merge_targets): Adjust. + (&handle_factored_dependencies): Required targets are phony. + * texinfos.am: Build info, dvi, and the corresponding -am or + -recursive targets. + + 2001-03-05 Akim Demaille * automake.in (&am_install_var): Remove $cygxform, unused. diff --git a/Makefile.in b/Makefile.in index de6b2b18..b5976b8f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -495,10 +495,6 @@ distcheck: dist -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' -info-am: $(INFO_DEPS) -info: info-recursive -dvi-am: $(DVIS) -dvi: dvi-recursive check-am: all-am check: check-recursive all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA) @@ -544,6 +540,14 @@ distclean: distclean-recursive distclean-am: clean-am distclean-generic distclean-tags +dvi: dvi-recursive + +dvi-am: $(DVIS) + +info: info-recursive + +info-am: $(INFO_DEPS) + install-data-am: install-dist_pkgdataDATA install-dist_scriptDATA \ install-info-am @$(NORMAL_INSTALL) @@ -575,16 +579,16 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ install install-am install-binSCRIPTS install-data \ install-data-am install-data-recursive install-dist_pkgdataDATA \ install-dist_scriptDATA install-exec install-exec-am \ - install-exec-recursive install-info-am install-recursive \ - install-strip installcheck installcheck-local \ - installcheck-recursive installdirs installdirs-am \ - installdirs-recursive maintainer-clean maintainer-clean-aminfo \ - maintainer-clean-generic maintainer-clean-recursive \ - maintainer-clean-vti mostlyclean mostlyclean-aminfo \ - mostlyclean-generic mostlyclean-recursive mostlyclean-vti tags \ - tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA \ - uninstall-info uninstall-recursive + install-exec-recursive install-info-am install-man \ + install-recursive install-strip installcheck installcheck-am \ + installcheck-local installcheck-recursive installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-aminfo maintainer-clean-generic \ + maintainer-clean-recursive maintainer-clean-vti mostlyclean \ + mostlyclean-aminfo mostlyclean-generic mostlyclean-recursive \ + mostlyclean-vti tags tags-recursive uninstall uninstall-am \ + uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ + uninstall-dist_scriptDATA uninstall-info uninstall-recursive install-data-hook: diff --git a/automake.in b/automake.in index c324f56d..2f6c0f95 100755 --- a/automake.in +++ b/automake.in @@ -394,11 +394,17 @@ my %configure_dist_common = (); my %required_targets = ( 'all' => 1, + 'dvi' => 1, + 'info' => 1, 'install' => 1, 'install-data' => 1, 'install-exec' => 1, # FIXME: Not required, temporary hacks. + # Well, actually they are sort of required: the -recursive + # targets will run them anyway... + 'dvi-am' => 1, + 'info-am' => 1, 'install-data-am' => 1, 'install-exec-am' => 1, 'installcheck-am' => 1, @@ -485,8 +491,6 @@ my %dist_common; my %dist_dirs; # List of dependencies for the obvious targets. -my @info; -my @dvi; my @all; my @check; my @check_tests; @@ -683,8 +687,6 @@ sub initialize_per_input () %dist_dirs = (); # List of dependencies for the obvious targets. - @info = (); - @dvi = (); @all = (); @check = (); @check_tests = (); @@ -696,6 +698,12 @@ sub initialize_per_input () # in Makefile: keeping related stuff altogether. %dependencies = ( + # Texinfoing. + 'dvi' => [], + 'dvi-am' => [], + 'info' => [], + 'info-am' => [], + # Installing/uninstalling. 'install-data-am' => [], 'install-exec-am' => [], @@ -2860,8 +2868,6 @@ sub handle_texinfo # get run twice during "make all". unshift (@all, '$(INFO_DEPS)'); } - push (@info, '$(INFO_DEPS)'); - push (@dvi, '$(DVIS)'); &define_variable ("INFO_DEPS", join (' ', @info_deps_list)); &define_variable ("DVIS", join (' ', @dvis_list)); @@ -3933,8 +3939,6 @@ sub handle_merge_targets if dirname ($one_name) eq $relative_dir; } - &do_one_merge_target ('info', @info); - &do_one_merge_target ('dvi', @dvi); &do_check_merge_target; if (defined $options{'no-installinfo'}) @@ -4195,6 +4199,9 @@ sub handle_factored_dependencies } } + # All the required targets are phony. + grep { &depend ('.PHONY', $_) } keys %required_targets; + # Actually output gathered targets. foreach (sort target_cmp keys %dependencies) { diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 595cd582..72a639b9 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -22,6 +22,14 @@ DVIPS = dvips .dvi.ps: $(DVIPS) $< -o $@ +.PHONY: info info-am dvi dvi-am +?SUBDIRS?.PHONY info: info-recursive +?SUBDIRS?.PHONY dvi: dvi-recursive +?!SUBDIRS?info: info-am +?!SUBDIRS?dvi: dvi-am +info-am: $(INFO_DEPS) +dvi-am: $(DVIS) + ## Look in both . and srcdir because the info pages might have been ## rebuilt in the build directory. Can't cd to srcdir; that might ## break a possible install-sh reference. diff --git a/m4/Makefile.in b/m4/Makefile.in index a5579016..a6d7d2ff 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -145,10 +145,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am all-am: Makefile $(DATA) @@ -190,6 +186,14 @@ distclean: distclean-am distclean-am: clean-am distclean-generic +dvi: + +dvi-am: + +info: + +info-am: + install-data-am: install-m4dataDATA install-exec-am: @@ -211,8 +215,8 @@ uninstall-am: uninstall-m4dataDATA .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-data install-data-am install-exec \ - install-exec-am install-m4dataDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-exec-am install-m4dataDATA install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ uninstall uninstall-am uninstall-m4dataDATA diff --git a/tests/Makefile.in b/tests/Makefile.in index 30cc5dd1..9ff1b764 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -450,10 +450,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am @@ -495,6 +491,14 @@ distclean: distclean-am distclean-am: clean-am distclean-generic distclean-local +dvi: + +dvi-am: + +info: + +info-am: + install-data-am: install-exec-am: @@ -514,8 +518,8 @@ mostlyclean-am: mostlyclean-generic .PHONY: all all-am check check-TESTS check-am clean clean-generic \ distclean distclean-generic distclean-local distdir dvi dvi-am \ info info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-exec install-exec-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ uninstall uninstall-am diff --git a/texinfos.am b/texinfos.am index 595cd582..72a639b9 100644 --- a/texinfos.am +++ b/texinfos.am @@ -22,6 +22,14 @@ DVIPS = dvips .dvi.ps: $(DVIPS) $< -o $@ +.PHONY: info info-am dvi dvi-am +?SUBDIRS?.PHONY info: info-recursive +?SUBDIRS?.PHONY dvi: dvi-recursive +?!SUBDIRS?info: info-am +?!SUBDIRS?dvi: dvi-am +info-am: $(INFO_DEPS) +dvi-am: $(DVIS) + ## Look in both . and srcdir because the info pages might have been ## rebuilt in the build directory. Can't cd to srcdir; that might ## break a possible install-sh reference.