* 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 127045af9cdc84844adf56d94bf5d66a267dda0f..c9195f8a27a41d954b9d38f2e3a8450894bf59e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-06  Akim Demaille  <akim@epita.fr>
+
+       * 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  <akim@epita.fr>
 
        * lib/Automake/Variable.pm, lib/Automake/VarDef.pm (VAR_SORTED):

diff --git a/Makefile.in b/Makefile.in
index 4cc1303a317e4791e151ba147afe38117d50537f..d51481c325cb5bcd77e70d2a210460771fab3a32 100644 (file)
--- 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 155b21f8370272bd50b9811cde979b8f60c8ebe0..e95d784662b8af02fc5a52ef7e7efac6436502b7 100644 (file)
--- 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 0a7642ecede3ebbf5746a55e4d43492be18bb45e..c99d1e76aa70554af1aaf7f0fcfbc312c3a52f22 100644 (file)
--- 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 dc51c9f65c0a6111e0bdab26b107e4f78e6af091..13432836663fb7b08306b164af7efe32dce9809f 100644 (file)
--- 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 5d54908c13b54380d9975ae09c186a4b4aee1510..3df5ceb3f3302682dbdcdc82c6d9b24835040b79 100644 (file)
--- 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 e178c2a1996fa5111186a5b75299cdc13ff34315..ba32a7206b60169fa34be505e9234e1936860572 100644 (file)
--- 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 2a610404a732ca2e45c808e35425498ced254079..c1150e724f50a068817a2f948a2d3ef353a4c48b 100644 (file)
--- 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 943b274472bee737faa03a59d1dd01631c76b207..ff19b23981d21bcc3250d0bab3ad15e7643ad39b 100644 (file)
--- 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 fa0c09998f554f0289a719e955637a6e509f83ad..4a8eab1aba7cf41028d7ede646b8450a23147867 100644 (file)
--- 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 77c50490b28b4c10d4407efd46281acad84aacaa..e8cc0fa1c5ca8102ae85a67d02a0d9c3fab7485d 100644 (file)
--- 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