From 7b3d03208cf6aabb1c795c16351d7c448642816d Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 26 Feb 2001 09:33:06 +0000 Subject: [PATCH] * automake.in (&handle_merge_targets, &do_one_merge_target): Don't handle install and install-am. * install.am: Do it. --- ChangeLog | 8 ++++++-- Makefile.in | 7 ++++--- automake.in | 9 --------- install.am | 10 +++++++--- lib/am/install.am | 10 +++++++--- m4/Makefile.in | 7 ++++--- tests/Makefile.in | 7 ++++--- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5a9960e..175dd6a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-02-26 Akim Demaille + + * automake.in (&handle_merge_targets, &do_one_merge_target): Don't + handle install and install-am. + * install.am: Do it. + 2001-02-26 Akim Demaille * automake.in (&handle_merge_targets, &do_one_merge_target): Don't @@ -189,12 +195,10 @@ * automake.in: Formatting and mying changes. - 2001-02-23 Akim Demaille * automake.in: Formatting and mying changes. - 2001-02-23 Akim Demaille * automake.in (&handle_man_pages): Let install-man and diff --git a/Makefile.in b/Makefile.in index 32db1067..80dfade3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -502,19 +502,20 @@ check-am: all-am check: check-recursive installcheck-am: installcheck-local installcheck: installcheck-recursive -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA) installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(scriptdir) +install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install diff --git a/automake.in b/automake.in index 08fabd56..93969495 100755 --- a/automake.in +++ b/automake.in @@ -3643,8 +3643,6 @@ sub handle_merge_targets $output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n"; } # Print definitions users can use. - &do_one_merge_target ('install', 'all-am'); - &do_one_merge_target ('all', @all); } @@ -3678,13 +3676,6 @@ sub do_one_merge_target { &pretty_print_rule ("$name-am:", "\t\t", @values); } - if ($name eq 'install') - { - # Special-case `install-am' to run install-exec-am and - # install-data-am after all-am is built. - &pretty_print_rule ("\t\@\$(MAKE) \$(AM_MAKEFLAGS)", "\t ", - 'install-exec-am', 'install-data-am'); - } # To understand this special case, see handle_merge_targets. if ($name eq 'all') diff --git a/install.am b/install.am index 7b8da0af..dda29645 100644 --- a/install.am +++ b/install.am @@ -36,17 +36,21 @@ .PHONY: install install-exec install-data uninstall ?SUBDIRS?.PHONY: install-recursive install-exec-recursive install-data-recursive uninstall-recursive -## FIXME: not ready: ?SUBDIRS?install: install-recursive +?SUBDIRS?install: install-recursive ?SUBDIRS?install-exec: install-exec-recursive ?SUBDIRS?install-data: install-data-recursive ?SUBDIRS?uninstall: uninstall-recursive -.PHONY: install-am install-exec-am install-data-am uninstall-am -## FIXME: not ready: ?!SUBDIRS?install: install-am +.PHONY: install-exec-am install-data-am uninstall-am +?!SUBDIRS?install: install-am ?!SUBDIRS?install-exec: install-exec-am ?!SUBDIRS?install-data: install-data-am ?!SUBDIRS?uninstall: uninstall-am +.PHONY: install-am +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-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 7b8da0af..dda29645 100644 --- a/lib/am/install.am +++ b/lib/am/install.am @@ -36,17 +36,21 @@ .PHONY: install install-exec install-data uninstall ?SUBDIRS?.PHONY: install-recursive install-exec-recursive install-data-recursive uninstall-recursive -## FIXME: not ready: ?SUBDIRS?install: install-recursive +?SUBDIRS?install: install-recursive ?SUBDIRS?install-exec: install-exec-recursive ?SUBDIRS?install-data: install-data-recursive ?SUBDIRS?uninstall: uninstall-recursive -.PHONY: install-am install-exec-am install-data-am uninstall-am -## FIXME: not ready: ?!SUBDIRS?install: install-am +.PHONY: install-exec-am install-data-am uninstall-am +?!SUBDIRS?install: install-am ?!SUBDIRS?install-exec: install-exec-am ?!SUBDIRS?install-data: install-data-am ?!SUBDIRS?uninstall: uninstall-am +.PHONY: install-am +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-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 04c64cf9..f61605b0 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -151,18 +151,19 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am all-am: Makefile $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(m4datadir) +install: install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-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 51a332f2..88bba609 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -456,17 +456,18 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am all-am: Makefile installdirs: +install: install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install -- 2.43.5