From: Akim Demaille Date: Sun, 6 Jul 2003 19:30:46 +0000 (+0000) Subject: * lib/am/subdirs.am (RECURSIVE_TARGETS): Move install-recursive, X-Git-Tag: Release-1-7b~124 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=164a3583ad1eb69c811a0ab9f5c0825b34bd7d17;p=thirdparty%2Fautomake.git * lib/am/subdirs.am (RECURSIVE_TARGETS): Move install-recursive, install-exec-recursive, install-data-recursive and uninstall-recursive addition to... * lib/am/texinfos.am: here. * lib/am/texinfos.am, lib/am/subdirs.am: Remove the .PHONY declaration of RECURSIVE_TARGETS. --- diff --git a/ChangeLog b/ChangeLog index 127045af9..c9195f8a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-07-06 Akim Demaille + + * lib/am/subdirs.am (RECURSIVE_TARGETS): Move install-recursive, + install-exec-recursive, install-data-recursive and + uninstall-recursive addition to... + * lib/am/texinfos.am: here. + * lib/am/texinfos.am, lib/am/subdirs.am: Remove the .PHONY + declaration of RECURSIVE_TARGETS. + 2003-07-06 Akim Demaille * lib/Automake/Variable.pm, lib/Automake/VarDef.pm (VAR_SORTED): diff --git a/Makefile.in b/Makefile.in index 4cc1303a3..d51481c32 100644 --- a/Makefile.in +++ b/Makefile.in @@ -611,7 +611,6 @@ all-am: Makefile $(INFO_DEPS) $(SCRIPTS) installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -726,17 +725,15 @@ uninstall-info: uninstall-info-recursive distclean-generic distclean-recursive distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-binSCRIPTS \ - install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-man install-recursive \ - install-strip installcheck installcheck-am 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 pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \ - uninstall-info-recursive uninstall-recursive + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-recursive \ + maintainer-clean-vti mostlyclean mostlyclean-aminfo \ + mostlyclean-generic mostlyclean-recursive mostlyclean-vti pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binSCRIPTS uninstall-info-am install-exec-hook: diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 155b21f83..e95d78466 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -358,7 +358,6 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(perllibdir) - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -435,17 +434,15 @@ uninstall-info: uninstall-info-recursive clean clean-generic clean-recursive ctags ctags-recursive \ distclean distclean-generic distclean-recursive distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-recursive \ + install-am install-data install-data-am \ install-dist_perllibDATA install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-man install-recursive install-strip installcheck \ - installcheck-am installdirs installdirs-am \ - installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_perllibDATA uninstall-info-am \ - uninstall-info-recursive uninstall-recursive + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-dist_perllibDATA \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 0a7642ece..c99d1e76a 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -263,7 +263,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am diff --git a/lib/Makefile.in b/lib/Makefile.in index dc51c9f65..134328366 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -368,7 +368,6 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(pkgvdatadir) $(DESTDIR)$(scriptdir) - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -448,17 +447,16 @@ uninstall-info: uninstall-info-recursive clean clean-generic clean-recursive ctags ctags-recursive \ distclean distclean-generic distclean-recursive distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-recursive \ + install-am install-data install-data-am \ install-dist_pkgvdataDATA install-dist_scriptDATA install-exec \ - install-exec-am install-exec-recursive install-info \ - install-info-am install-man install-recursive install-strip \ - installcheck installcheck-am installcheck-local installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installcheck-local \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \ - uninstall-info-am uninstall-info-recursive uninstall-recursive + uninstall-info-am install-data-hook: diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 5d54908c1..3df5ceb3f 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -211,7 +211,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: $(mkinstalldirs) $(DESTDIR)$(amdir) install: install-am diff --git a/lib/am/install.am b/lib/am/install.am index e178c2a19..ba32a7206 100644 --- a/lib/am/install.am +++ b/lib/am/install.am @@ -16,17 +16,22 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## -------------------------- ## -## Creating the installdirs. ## -## -------------------------- ## -?SUBDIRS?.PHONY: installdirs installdirs-am installdirs-recursive -?SUBDIRS?installdirs: installdirs-recursive -?SUBDIRS?installdirs-am:%installdirs-local% -?SUBDIRS??am__installdirs? $(mkinstalldirs) %am__installdirs% +## ----------------------------------------- ## +## installdirs -- Creating the installdirs. ## +## ----------------------------------------- ## -?!SUBDIRS?.PHONY: installdirs -?!SUBDIRS?installdirs:%installdirs-local% -?!SUBDIRS??am__installdirs? $(mkinstalldirs) %am__installdirs% + +if %?SUBDIRS% +.PHONY: installdirs installdirs-am +RECURSIVE_TARGETS += installdirs-recursive +installdirs: installdirs-recursive +installdirs-am:%installdirs-local% +?am__installdirs? $(mkinstalldirs) %am__installdirs% +else !%?SUBDIRS% +.PHONY: installdirs +installdirs:%installdirs-local% +?am__installdirs? $(mkinstalldirs) %am__installdirs% +endif !%?SUBDIRS% ## ----------------- ## @@ -37,7 +42,8 @@ .PHONY: install-exec-am install-data-am uninstall-am if %?SUBDIRS% -.PHONY: install-recursive install-exec-recursive install-data-recursive uninstall-recursive +RECURSIVE_TARGETS += install-data-recursive install-exec-recursive \ + install-recursive uninstall-recursive install:%maybe_BUILT_SOURCES% install-recursive install-exec: install-exec-recursive install-data: install-data-recursive diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am index 2a610404a..c1150e724 100644 --- a/lib/am/subdirs.am +++ b/lib/am/subdirs.am @@ -18,9 +18,7 @@ ## 02111-1307, USA. RECURSIVE_TARGETS += \ -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive +all-recursive check-recursive installcheck-recursive .PHONY: $(RECURSIVE_TARGETS) diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 943b27447..ff19b2398 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -182,7 +182,7 @@ endif ! %?LOCAL-TEXIS% ## -------------- ## ?SUBDIRS?RECURSIVE_TARGETS += uninstall-info-recursive -?SUBDIRS?.PHONY uninstall-info: uninstall-info-recursive +?SUBDIRS?uninstall-info: uninstall-info-recursive ?INSTALL-INFO?uninstall-am: uninstall-info-am .PHONY: uninstall-info-am diff --git a/m4/Makefile.in b/m4/Makefile.in index fa0c09998..4a8eab1ab 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -237,7 +237,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: $(mkinstalldirs) $(DESTDIR)$(m4datadir) install: install-am diff --git a/tests/Makefile.in b/tests/Makefile.in index 77c50490b..e8cc0fa1c 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -737,7 +737,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am