* automake.in (&handle_merge_targets, &do_one_merge_target): Don't

handle installcheck and installcheck-am.
* install.am: Do it.

diff --git a/ChangeLog b/ChangeLog
index 175dd6a2bfba5dc5ccaf8fc8a11ab195b2350f5e..feab76d88668b3121c07e314318277b250335def 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-26  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&handle_merge_targets, &do_one_merge_target): Don't
+       handle installcheck and installcheck-am.
+       * install.am: Do it.
+
 2001-02-26  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&handle_merge_targets, &do_one_merge_target): Don't

diff --git a/Makefile.in b/Makefile.in
index 80dfade3e8e656f9a8c202f86dc466d429e8876f..ad3843fc9996120036f2895017abd7aef7999553 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -500,8 +500,6 @@ dvi-am: $(DVIS)
 dvi: dvi-recursive
 check-am: all-am
 check: check-recursive
-installcheck-am: installcheck-local
-installcheck: installcheck-recursive
 all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
 
 installdirs: installdirs-recursive
@@ -516,6 +514,8 @@ uninstall: uninstall-recursive
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
+installcheck: installcheck-recursive
+
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
          INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
@@ -546,7 +546,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \
        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-am installcheck-local \
+       install-strip installcheck installcheck-local \
        installcheck-recursive installdirs installdirs-am \
        installdirs-recursive maintainer-clean maintainer-clean-aminfo \
        maintainer-clean-generic maintainer-clean-recursive \
@@ -582,6 +582,8 @@ mostlyclean: mostlyclean-recursive
 
 clean: clean-recursive
 
+installcheck-am: installcheck-local
+
 
 install-data-hook:
        @$(POST_INSTALL)

diff --git a/automake.in b/automake.in
index 93969495caada997c6a3658ded8ceb537c0c6d48..cb29826e3f75666950a6928a30fb98545bbdc3b9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3593,7 +3593,6 @@ sub handle_merge_targets
     &do_one_merge_target ('info', @info);
     &do_one_merge_target ('dvi', @dvi);
     &do_check_merge_target;
-    &do_one_merge_target ('installcheck', @installcheck);
 
     if (defined $options{'no-installinfo'})
     {
@@ -6527,7 +6526,6 @@ sub initialize_per_input
     @all = ();
     @check = ();
     @check_tests = ();
-    @installcheck = ();
 
     # Holds the dependencies of targets which dependencies are factored.
     # Typically, `.PHONY' will appear in plenty of *.am files, but must
@@ -6542,6 +6540,7 @@ sub initialize_per_input
        'install-man'         => [],
        'uninstall-man'       => [],
        'uninstall-am'         => [],
+       'installcheck-am'      => [],
 
        # Cleaning.
        'clean-am'             => [],

diff --git a/install.am b/install.am
index dda296454bb94945e96623427b34692f6592e53b..85418a6a7d4949095fbe2ae138ffb7a825edee63 100644 (file)
--- a/install.am
+++ b/install.am
@@ -51,6 +51,13 @@
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
+
+.PHONY: installcheck
+?SUBDIRS?installcheck: installcheck-recursive
+?!SUBDIRS?installcheck: installcheck-am
+?!SUBDIRS?.PHONY: installcheck-am
+?!SUBDIRS?installcheck-am:
+
 ## If you ever modify this, keep in mind that INSTALL_PROGRAM is used
 ## in subdirectories, so never set it to a value relative to the top
 ## directory.

diff --git a/lib/am/install.am b/lib/am/install.am
index dda296454bb94945e96623427b34692f6592e53b..85418a6a7d4949095fbe2ae138ffb7a825edee63 100644 (file)
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -51,6 +51,13 @@
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
+
+.PHONY: installcheck
+?SUBDIRS?installcheck: installcheck-recursive
+?!SUBDIRS?installcheck: installcheck-am
+?!SUBDIRS?.PHONY: installcheck-am
+?!SUBDIRS?installcheck-am:
+
 ## If you ever modify this, keep in mind that INSTALL_PROGRAM is used
 ## in subdirectories, so never set it to a value relative to the top
 ## directory.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index f61605b0c79c2a4eaeefd9bd056da470390d1811..89529f2008958fb8062f797f9532815b591dcf1e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -149,8 +149,6 @@ dvi-am:
 dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
 all-am: Makefile $(DATA)
 
 installdirs:
@@ -164,6 +162,8 @@ uninstall: uninstall-am
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
+installcheck: installcheck-am
+
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
          INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 88bba609cab3931722affc7193f58a6b0e1e8db3..2e1eb4fa4e0eb2055052a8e152147f7482cd02a6 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -454,8 +454,6 @@ dvi: dvi-am
 check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
 all-am: Makefile
 
 installdirs:
@@ -468,6 +466,8 @@ uninstall: uninstall-am
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
+installcheck: installcheck-am
+
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
          INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install