From 38cd4107f5c9cfabd0a577adf2cef1d759c18346 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 9 Apr 2001 14:44:03 +0000 Subject: [PATCH] * subdirs.am: Don't define info related recursive targets. * texinfos.am: Do. --- ChangeLog | 5 +++++ Makefile.in | 7 +++---- lib/am/subdirs.am | 3 +-- lib/am/texinfos.am | 29 +++++++++++++++++++++-------- subdirs.am | 3 +-- texinfos.am | 29 +++++++++++++++++++++-------- 6 files changed, 52 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50682aae..e813a4ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-04-09 Akim Demaille + + * subdirs.am: Don't define info related recursive targets. + * texinfos.am: Do. + 2001-04-09 Akim Demaille * subdirs.am (RECURSIVE_TARGETS): New variable. diff --git a/Makefile.in b/Makefile.in index 56d4330b..6c616430 100644 --- a/Makefile.in +++ b/Makefile.in @@ -130,11 +130,10 @@ TEXINFOS = automake.texi DATA = $(dist_pkgdata_DATA) $(dist_script_DATA) -RECURSIVE_TARGETS = all-recursive install-data-recursive \ +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive install-info-recursive \ - uninstall-info-recursive check-recursive installcheck-recursive \ - info-recursive dvi-recursive + uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \ COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README-alpha \ THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 ansi2knr.c automake.in \ diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am index 2c0f810e..4b1ab2fd 100644 --- a/lib/am/subdirs.am +++ b/lib/am/subdirs.am @@ -20,8 +20,7 @@ RECURSIVE_TARGETS += \ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ -?INSTALL-INFO?install-info-recursive uninstall-info-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive +check-recursive installcheck-recursive .PHONY: $(RECURSIVE_TARGETS) diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 5c4cf950..0d08fd4f 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -23,10 +23,15 @@ DVIPS = dvips $(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 +if %?SUBDIRS% +RECURSIVE_TARGETS += info-recursive dvi-recursive +.PHONY info: info-recursive +.PHONY dvi: dvi-recursive +else %?SUBDIRS% +info: info-am +dvi: dvi-am +endif %?SUBDIRS% + info-am: $(INFO_DEPS) dvi-am: $(DVIS) @@ -39,10 +44,16 @@ dvi-am: $(DVIS) ## ## TEXINFOS primary are always installed in infodir, hence install-data ## is hard coded. -?INSTALL-INFO?_am_installdirs += $(DESTDIR)$(infodir) -?SUBDIRS?.PHONY install-info: install-info-recursive -?!SUBDIRS?.PHONY install-info: install-info-am -?INSTALL-INFO?install-data-am: install-info-am +if %?INSTALL-INFO% +_am_installdirs += $(DESTDIR)$(infodir) +install-data-am: install-info-am +if %?SUBDIRS% +RECURSIVE_TARGETS += install-info-recursive +.PHONY install-info: install-info-recursive +else %?SUBDIRS% +.PHONY install-info: install-info-am +endif %?SUBDIRS% +endif %?INSTALL-INFO% install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(infodir) @@ -83,9 +94,11 @@ install-info-am: $(INFO_DEPS) ## Uninstalling info pages. ## ## ------------------------- ## +?SUBDIRS?RECURSIVE_TARGETS += uninstall-info-recursive ?SUBDIRS?.PHONY uninstall-info: uninstall-info-recursive ?!SUBDIRS?.PHONY uninstall-info: uninstall-info-am ?INSTALL-INFO?uninstall-am: uninstall-info-am + uninstall-info-am: $(PRE_UNINSTALL) ## Run two loops here so that we can handle PRE_UNINSTALL and diff --git a/subdirs.am b/subdirs.am index 2c0f810e..4b1ab2fd 100644 --- a/subdirs.am +++ b/subdirs.am @@ -20,8 +20,7 @@ RECURSIVE_TARGETS += \ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ -?INSTALL-INFO?install-info-recursive uninstall-info-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive +check-recursive installcheck-recursive .PHONY: $(RECURSIVE_TARGETS) diff --git a/texinfos.am b/texinfos.am index 5c4cf950..0d08fd4f 100644 --- a/texinfos.am +++ b/texinfos.am @@ -23,10 +23,15 @@ DVIPS = dvips $(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 +if %?SUBDIRS% +RECURSIVE_TARGETS += info-recursive dvi-recursive +.PHONY info: info-recursive +.PHONY dvi: dvi-recursive +else %?SUBDIRS% +info: info-am +dvi: dvi-am +endif %?SUBDIRS% + info-am: $(INFO_DEPS) dvi-am: $(DVIS) @@ -39,10 +44,16 @@ dvi-am: $(DVIS) ## ## TEXINFOS primary are always installed in infodir, hence install-data ## is hard coded. -?INSTALL-INFO?_am_installdirs += $(DESTDIR)$(infodir) -?SUBDIRS?.PHONY install-info: install-info-recursive -?!SUBDIRS?.PHONY install-info: install-info-am -?INSTALL-INFO?install-data-am: install-info-am +if %?INSTALL-INFO% +_am_installdirs += $(DESTDIR)$(infodir) +install-data-am: install-info-am +if %?SUBDIRS% +RECURSIVE_TARGETS += install-info-recursive +.PHONY install-info: install-info-recursive +else %?SUBDIRS% +.PHONY install-info: install-info-am +endif %?SUBDIRS% +endif %?INSTALL-INFO% install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(infodir) @@ -83,9 +94,11 @@ install-info-am: $(INFO_DEPS) ## Uninstalling info pages. ## ## ------------------------- ## +?SUBDIRS?RECURSIVE_TARGETS += uninstall-info-recursive ?SUBDIRS?.PHONY uninstall-info: uninstall-info-recursive ?!SUBDIRS?.PHONY uninstall-info: uninstall-info-am ?INSTALL-INFO?uninstall-am: uninstall-info-am + uninstall-info-am: $(PRE_UNINSTALL) ## Run two loops here so that we can handle PRE_UNINSTALL and -- 2.43.5