[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
69-installcheck.patch
From: |
Akim Demaille |
Subject: |
69-installcheck.patch |
Date: |
Sat, 24 Feb 2001 19:16:40 +0100 |
Yes @installcheck was not used (and at least since 1.4, I checked).
Yes there is there are stall targets (installcheck-am), but it's
because the copy I have of Automake at home doesn't have the
%required_targets hash, so I'll fix this once at Epita when applying
the patch.
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (&handle_merge_targets, &do_one_merge_target): Don't
handle installcheck and installcheck-am.
* install.am: Do it.
Index: Makefile.in
--- Makefile.in Sat, 24 Feb 2001 16:56:04 +0100 akim (am/h/16_Makefile.i 1.22
644)
+++ Makefile.in Sat, 24 Feb 2001 17:07:30 +0100 akim (am/h/16_Makefile.i 1.22
644)
@@ -522,8 +522,6 @@
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
@@ -538,6 +536,8 @@
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+installcheck: installcheck-recursive
+
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
@@ -571,6 +571,8 @@
install-exec-am: install-binSCRIPTS
+installcheck-am: installcheck-local
+
maintainer-clean: maintainer-clean-recursive
-rm -f config.status
@@ -592,7 +594,7 @@
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 \
Index: automake.in
--- automake.in Sat, 24 Feb 2001 16:56:04 +0100 akim (am/f/39_automake.i 1.76
755)
+++ automake.in Sat, 24 Feb 2001 17:05:59 +0100 akim (am/f/39_automake.i 1.76
755)
@@ -3559,7 +3559,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'})
{
@@ -6485,7 +6484,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
@@ -6500,6 +6498,7 @@ sub initialize_per_input
'install-man' => [],
'uninstall-man' => [],
'uninstall-am' => [],
+ 'installcheck-am' => [],
# Cleaning.
'clean-am' => [],
Index: install.am
--- install.am Sat, 24 Feb 2001 16:56:04 +0100 akim (am/h/26_install.am 1.4 644)
+++ install.am Sat, 24 Feb 2001 17:07:25 +0100 akim (am/h/26_install.am 1.4 644)
@@ -51,6 +51,12 @@
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:
+
## We can't just set INSTALL_PROGRAM because that might be a relative
## path.
.PHONY: install-strip
Index: m4/Makefile.in
--- m4/Makefile.in Sat, 24 Feb 2001 16:56:04 +0100 akim (am/h/15_Makefile.i
1.17 644)
+++ m4/Makefile.in Sat, 24 Feb 2001 17:07:31 +0100 akim (am/h/15_Makefile.i
1.17 644)
@@ -143,8 +143,6 @@
dvi: dvi-am
check-am: all-am
check: check-am
-installcheck-am:
-installcheck: installcheck-am
all-am: Makefile $(DATA)
installdirs:
@@ -157,6 +155,8 @@
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
Index: tests/Makefile.in
--- tests/Makefile.in Sat, 24 Feb 2001 16:56:04 +0100 akim (am/h/14_Makefile.i
1.19 644)
+++ tests/Makefile.in Sat, 24 Feb 2001 17:07:32 +0100 akim (am/h/14_Makefile.i
1.19 644)
@@ -446,8 +446,6 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-installcheck-am:
-installcheck: installcheck-am
all-am: Makefile
installdirs:
@@ -459,6 +457,8 @@
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
- 69-installcheck.patch,
Akim Demaille <=