[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
52-factored-install.patch
|
From: |
Akim Demaille |
|
Subject: |
52-factored-install.patch |
|
Date: |
Wed, 21 Feb 2001 21:22:27 +0100 |
This patch applies the same transformation, factoring, to
install-data, install-exec and uninstall.
Below are first presented the Makefiles of Automake. There is
obviously a problem, which I do not solve in this already too long
patch, but will address later: what do with empty targets. For
instance if you read m4/Makefile.in install-exec-am is no longer
defined, as it's empty. But install-exec still invokes it, as it hard
coded.
At this stage the answer is obvious: install-exec too must be included
in the factored dependencies, but it is only delaying the issue as we
will have the same with install invoking install-exec, or outer
Makefiles invoking it. I guess we will need a list of targets to
issue even if empty, no big deal.
If someone really feels like reading the patch, please, double check
with me the repartition between install-data-am and install-exec-am in
the *.am files: I've been careful, but I should confess I feel I could
have missed something.
Also, I have not really understood why the -hooks had to be run
explicitly by invoking make again instead of just listing them as
dependencies.
At some point (maybe already now?), my patches will sure introduce
problems as factored dependencies are output in alphabetical order. I
don't like the idea that that order be gained simply by the order in
which dependencies have been discovered. Rather it seems to me that
automake should know how to sort them properly. It is much more
robust, and the information (the right order) is localized (the
sorting routine) instead of being spread all over automake.
OTOH, maybe the order doesn't mean anything at all, since I seem to
have understood that in parallel makes
foo: bar baz
means bar and baz can be performed concurrently.
Index: Makefile.in
--- Makefile.in Mon, 19 Feb 2001 02:58:32 +0100 akim (am/h/16_Makefile.i 1.17
644)
+++ Makefile.in Wed, 21 Feb 2001 20:37:04 +0100 akim (am/h/16_Makefile.i 1.17
644)
@@ -528,20 +528,11 @@
check: check-recursive
installcheck-am: installcheck-local
installcheck: installcheck-recursive
-install-exec-am: install-binSCRIPTS
install-exec: install-exec-recursive
-
-install-data-am: install-info-am install-dist_pkgdataDATA \
- install-dist_scriptDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-data: install-data-recursive
-
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-recursive
-uninstall-am: uninstall-binSCRIPTS uninstall-info \
- uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA
uninstall: uninstall-recursive
all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
install-strip:
@@ -576,6 +567,13 @@
distclean-am: clean-am distclean-generic distclean-tags
+install-data-am: install-dist_pkgdataDATA install-dist_scriptDATA \
+ install-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am: install-binSCRIPTS
+
maintainer-clean: maintainer-clean-recursive
-rm -f config.status
@@ -586,12 +584,15 @@
mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti
+uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \
+ uninstall-dist_scriptDATA uninstall-info
+
.PHONY: all all-am all-recursive check check-am check-recursive clean \
- clean-generic clean-recursive dist dist-all distcheck distclean \
- distclean-generic distclean-recursive distclean-tags distdir \
- dvi dvi-am dvi-recursive info info-am info-recursive install \
- install-am install-binSCRIPTS install-data install-data-am \
- install-data-recursive install-dist_pkgdataDATA \
+ clean-generic clean-recursive dist dist-all dist-info distcheck \
+ distclean distclean-generic distclean-recursive distclean-tags \
+ distdir dvi dvi-am dvi-recursive info info-am info-recursive \
+ install install-am install-binSCRIPTS install-data \
+ 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 \
Index: m4/Makefile.in
--- m4/Makefile.in Mon, 19 Feb 2001 02:58:32 +0100 akim (am/h/15_Makefile.i
1.13 644)
+++ m4/Makefile.in Wed, 21 Feb 2001 20:37:05 +0100 akim (am/h/15_Makefile.i
1.13 644)
@@ -146,16 +146,11 @@
check: check-am
installcheck-am:
installcheck: installcheck-am
-install-exec-am:
install-exec: install-exec-am
-
-install-data-am: install-m4dataDATA
install-data: install-data-am
-
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
-uninstall-am: uninstall-m4dataDATA
uninstall: uninstall-am
all-am: Makefile $(DATA)
install-strip:
@@ -184,6 +179,8 @@
distclean-am: clean-am distclean-generic
+install-data-am: install-m4dataDATA
+
maintainer-clean: maintainer-clean-am
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -191,6 +188,8 @@
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
+
+uninstall-am: uninstall-m4dataDATA
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am info info-am install \
Index: tests/Makefile.in
--- tests/Makefile.in Mon, 19 Feb 2001 02:58:32 +0100 akim (am/h/14_Makefile.i
1.14 644)
+++ tests/Makefile.in Wed, 21 Feb 2001 20:37:06 +0100 akim (am/h/14_Makefile.i
1.14 644)
@@ -446,16 +446,11 @@
check: check-am
installcheck-am:
installcheck: installcheck-am
-install-exec-am:
install-exec: install-exec-am
-
-install-data-am:
install-data: install-data-am
-
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
-uninstall-am:
uninstall: uninstall-am
all-am: Makefile
install-strip:
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (&handle_texinfo, &handle_man_pages, &am_install_var):
Don't deal with install-data-am, install-exec-am and unstall-am.
(&initialize_per_input): Add them to %dependencies.
Remove %exec_dir_p since the *.am files are now in charge of it.
Remove @uninstall, @install_data, @install_exec.
(&handle_merge_targets): Adjust to these removals.
(&file_contents): Also &transform_cond for --no-installman and
--no-installinfo.
(&do_one_merge_target): Add some magic to install hooks on
%dependencies' targets.
* data.am, header.am, java.am, libs.am, lisp.am, ltlib.am,
* mans-vars.am, mans.am, progs.am, python.am, scripts.am,
* texinfos.am: Declare your dependencies on install-data-am,
install-exec-am and uninstall-am.
Index: automake.in
--- automake.in Wed, 21 Feb 2001 19:38:18 +0100 akim (am/f/39_automake.i 1.60
755)
+++ automake.in Wed, 21 Feb 2001 20:34:45 +0100 akim (am/f/39_automake.i 1.60
755)
@@ -2443,10 +2443,7 @@ sub handle_texinfo
if (! defined $options{'no-installinfo'})
{
- push (@uninstall, 'uninstall-info');
push (@installdirs, '$(DESTDIR)$(infodir)');
- unshift (@install_data, 'install-info-am');
-
# Make sure documentation is made and installed first. Use
# $(INFO_DEPS), not 'info', because otherwise recursive makes
# get run twice during "make all".
@@ -2527,7 +2524,6 @@ sub handle_man_pages
$output_rules .= &file_contents ('mans',
&transform ('SECTION', $sect));
}
- &depend ('.PHONY', 'install-man', 'uninstall-man');
# We don't really need this, but we use it in case we ever want to
# support noinst_MANS.
@@ -2537,8 +2533,6 @@ sub handle_man_pages
if (! defined $options{'no-installman'})
{
- push (@install_data, 'install-man');
- push (@uninstall, 'uninstall-man');
push (@all, '$(MANS)');
}
}
@@ -3679,14 +3673,11 @@ sub handle_merge_targets
$output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n";
}
# Print definitions users can use.
- &do_one_merge_target ('install-exec', @install_exec);
- $output_rules .= "\n";
-
- &do_one_merge_target ('install-data', @install_data);
- $output_rules .= "\n";
+ &do_one_merge_target ('install-exec');
+ &do_one_merge_target ('install-data');
&do_one_merge_target ('install', 'all-am');
- &do_one_merge_target ('uninstall', @uninstall);
+ &do_one_merge_target ('uninstall');
&do_one_merge_target ('all', @all);
@@ -3705,16 +3696,29 @@ sub handle_merge_targets
# relies on the fact that this doesn't add an extra \n at the end.
sub do_one_merge_target
{
- local ($name, @values) = @_;
+ my ($name, @values) = @_;
- if (&target_defined ($name . '-local'))
+ # Install hooks.
+ if (&target_defined ("$name-local"))
{
# User defined local form of target. So include it.
- push (@values, $name . '-local');
- &depend ('.PHONY', $name . '-local');
+ if (defined $dependencies{"$name-am"})
+ {
+ depend ("$name-am", "$name-local");
+ }
+ else
+ {
+ push (@values, "$name-local");
+ }
+ &depend ('.PHONY', "$name-local");
}
- &pretty_print_rule ($name . "-am:", "\t\t", @values);
+ # FIXME: Gross, should disapear once all these targets properly
+ # registered in %dependencies.
+ if (!defined $dependencies {"$name-am"})
+ {
+ &pretty_print_rule ("$name-am:", "\t\t", @values);
+ }
if ($name eq 'install')
{
# Special-case `install-am' to run install-exec-am and
@@ -3724,15 +3728,17 @@ sub do_one_merge_target
}
elsif ($name eq 'install-exec' && &target_defined ('install-exec-hook'))
{
- $output_rules .= ("address@hidden(NORMAL_INSTALL)\n"
- . "\t" . '$(MAKE) $(AM_MAKEFLAGS) install-exec-hook'
- . "\n");
+ $actions{'install-exec-am'} .=
+ ("address@hidden(NORMAL_INSTALL)\n"
+ . "\t" . '$(MAKE) $(AM_MAKEFLAGS) install-exec-hook'
+ . "\n");
}
elsif ($name eq 'install-data' && &target_defined ('install-data-hook'))
{
- $output_rules .= ("address@hidden(NORMAL_INSTALL)\n"
- . "\t" . '$(MAKE) $(AM_MAKEFLAGS) install-data-hook'
- . "\n");
+ $actions{'install-data-am'} .=
+ ("address@hidden(NORMAL_INSTALL)\n"
+ . "\t" . '$(MAKE) $(AM_MAKEFLAGS) install-data-hook'
+ . "\n");
}
# To understand this special case, see handle_merge_targets.
@@ -6389,26 +6395,6 @@ sub initialize_global_constants
$AC_CANONICAL_HOST = 1;
$AC_CANONICAL_SYSTEM = 2;
- # Associative array of standard directory names. Entry is TRUE if
- # corresponding directory should be installed during
- # 'install-exec' phase.
- %exec_dir_p =
- ('bin', 1,
- 'sbin', 1,
- 'libexec', 1,
- 'data', 0,
- 'sysconf', 1,
- 'localstate', 1,
- 'lib', 1,
- 'info', 0,
- 'man', 0,
- 'include', 0,
- 'oldinclude', 0,
- 'pkgdata', 0,
- 'pkglib', 1,
- 'pkginclude', 0
- );
-
# Commonly found files we look for and automatically include in
# DISTFILES.
@common_files =
@@ -6514,9 +6500,6 @@ sub initialize_per_input
%dist_dirs = ();
# List of dependencies for the obvious targets.
- @install_data = ();
- @install_exec = ();
- @uninstall = ();
@installdirs = ();
@info = ();
@@ -6534,8 +6517,11 @@ sub initialize_per_input
%dependencies =
(
# Installing/uninstalling.
+ 'install-data-am' => [],
+ 'install-exec-am' => [],
'install-man' => [],
'uninstall-man' => [],
+ 'uninstall-am' => [],
# Cleaning.
'clean-am' => [],
@@ -6684,12 +6670,17 @@ sub file_contents
# Sanity check over COMMAND, and complete it with global options.
&prog_error ("file_contents: $command")
if $command ne '' && substr ($command, -1) ne ';';
- $command .= &transform_cond ('CYGNUS' => $cygnus_mode,
- 'SHAR' => $options{'dist-shar'},
- 'BZIP2' => $options{'dist-bzip2'},
- 'ZIP' => $options{'dist-zip'},
- 'COMPRESS' => $options{'dist-tarZ'},
- 'CK-NEWS' => $options{'check-news'});
+ $command .=
+ &transform_cond ('CYGNUS' => $cygnus_mode,
+
+ 'SHAR' => $options{'dist-shar'},
+ 'BZIP2' => $options{'dist-bzip2'},
+ 'ZIP' => $options{'dist-zip'},
+ 'COMPRESS' => $options{'dist-tarZ'},
+
+ 'INSTALL-INFO' => !$options{'no-installinfo'},
+ 'INSTALL-MAN' => !$options{'no-installman'},
+ 'CK-NEWS' => $options{'check-news'});
# Swallow the file and applied the COMMAND.
my $file = $am_dir . '/' . $basename . '.am';
@@ -7189,19 +7180,7 @@ sub am_install_var
. $ltxform
. $cygxform);
- push (@uninstall, 'uninstall-' . $X . $primary);
- &depend ('.PHONY', 'uninstall-' . $X . $primary);
push (@installdirs, '$(DESTDIR)$(' . $X . 'dir)');
- if (defined $exec_dir_p{$X} ? $exec_dir_p{$X} : ($X =~ /exec/))
- {
- push (@install_exec, 'install-' . $X . $primary);
- &depend ('.PHONY', 'install-' . $X . $primary);
- }
- else
- {
- push (@install_data, 'install-' . $X . $primary);
- &depend ('.PHONY', 'install-' . $X . $primary);
- }
}
}
Index: data.am
--- data.am Fri, 09 Feb 2001 04:37:00 +0100 akim (am/g/46_data.am 1.4 644)
+++ data.am Wed, 21 Feb 2001 20:25:53 +0100 akim (am/g/46_data.am 1.4 644)
@@ -15,6 +15,8 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
+.PHONY install-data-am: address@hidden@DATA
address@hidden@DATA: $(@address@hidden)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -31,6 +33,7 @@
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(@address@hidden)/$$f; \
done
+.PHONY uninstall-am: address@hidden@DATA
address@hidden@DATA:
@$(NORMAL_UNINSTALL)
@list='$(@address@hidden)'; for p in $$list; do \
Index: header.am
--- header.am Sat, 17 Feb 2001 17:56:59 +0100 akim (am/g/38_header.am 1.5 644)
+++ header.am Wed, 21 Feb 2001 20:25:46 +0100 akim (am/g/38_header.am 1.5 644)
@@ -15,6 +15,8 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
+.PHONY install-data-am: address@hidden@HEADERS
address@hidden@HEADERS: $(@address@hidden)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -29,6 +31,7 @@
$(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@address@hidden)/$$f; \
done
+.PHONY uninstall-am: address@hidden@HEADERS
address@hidden@HEADERS:
@$(NORMAL_UNINSTALL)
@list='$(@address@hidden)'; for p in $$list; do \
Index: java.am
--- java.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/36_java.am 1.1 644)
+++ java.am Wed, 21 Feb 2001 20:26:35 +0100 akim (am/g/36_java.am 1.1 644)
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1998, 1999, 2001 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -15,6 +15,8 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
+.PHONY install-data-am: address@hidden@JAVA
address@hidden@JAVA: address@hidden@.stamp
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -26,6 +28,7 @@
$(INSTALL_DATA) $$p $(DESTDIR)$(@address@hidden)/$$p; \
done
+.PHONY uninstall-am: address@hidden@JAVA
address@hidden@JAVA:
@$(NORMAL_UNINSTALL)
@for p in *.class; do \
Index: libs.am
--- libs.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/32_libs.am 1.1 644)
+++ libs.am Wed, 21 Feb 2001 20:27:27 +0100 akim (am/g/32_libs.am 1.1 644)
@@ -15,6 +15,8 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
+.PHONY install-exec-am: address@hidden@LIBRARIES
address@hidden@LIBRARIES: $(@address@hidden)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -40,6 +42,7 @@
else :; fi; \
done
+.PHONY uninstall-am: address@hidden@LIBRARIES
address@hidden@LIBRARIES:
@$(NORMAL_UNINSTALL)
@list='$(@address@hidden)'; for p in $$list; do \
Index: lisp.am
--- lisp.am Tue, 20 Feb 2001 20:28:16 +0100 akim (am/g/29_lisp.am 1.5 644)
+++ lisp.am Wed, 21 Feb 2001 20:28:05 +0100 akim (am/g/29_lisp.am 1.5 644)
@@ -16,6 +16,7 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+.PHONY install-data-am: address@hidden@LISP
address@hidden@LISP: $(@address@hidden) $(ELCFILES)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -35,6 +36,7 @@
else : ; fi; \
done
+.PHONY uninstall-am: address@hidden@LISP
address@hidden@LISP:
@$(NORMAL_UNINSTALL)
@list='$(@address@hidden)'; for p in $$list; do \
Index: ltlib.am
--- ltlib.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/27_ltlib.am 1.1 644)
+++ ltlib.am Wed, 21 Feb 2001 20:28:40 +0100 akim (am/g/27_ltlib.am 1.1 644)
@@ -1,5 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2001
+## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -15,6 +16,8 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
+.PHONY install-exec-am: address@hidden@LTLIBRARIES
address@hidden@LTLIBRARIES: $(@address@hidden)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -31,6 +34,7 @@
else :; fi; \
done
+.PHONY uninstall-am: address@hidden@LTLIBRARIES
address@hidden@LTLIBRARIES:
@$(NORMAL_UNINSTALL)
@list='$(@address@hidden)'; for p in $$list; do \
Index: mans-vars.am
--- mans-vars.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/25_mans-vars. 1.1
644)
+++ mans-vars.am Wed, 21 Feb 2001 20:26:03 +0100 akim (am/g/25_mans-vars. 1.1
644)
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 2001 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -15,4 +15,13 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
NROFF = nroff
+
+## FIXME: This is not elegant: there is more than simply variables,
+## but we take advantage of the facts that these are factored dependencies,
+## and therefore will be output here, in the variable section.
+
+.PHONY: install-man uninstall-man
+?INSTALL-MAN?install-data-am: install-man
+?INSTALL-MAN?uninstall-am: uninstall-man
Index: mans.am
--- mans.am Tue, 20 Feb 2001 19:41:10 +0100 akim (am/g/24_mans.am 1.3 644)
+++ mans.am Wed, 21 Feb 2001 20:29:21 +0100 akim (am/g/24_mans.am 1.3 644)
@@ -16,7 +16,7 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-install-man .PHONY: address@hidden@
+.PHONY install-man: address@hidden@
address@hidden@:
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(address@hidden@dir)
@@ -44,7 +44,7 @@
done
## This is just completely gross.
-uninstall-man .PHONY: address@hidden@
+.PHONY uninstall-man: address@hidden@
address@hidden@:
@$(NORMAL_UNINSTALL)
@list='$(address@hidden@_MANS)'; \
Index: progs.am
--- progs.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/20_progs.am 1.1 644)
+++ progs.am Wed, 21 Feb 2001 20:30:08 +0100 akim (am/g/20_progs.am 1.1 644)
@@ -15,6 +15,8 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
+.PHONY install-exec-am: address@hidden@PROGRAMS
address@hidden@PROGRAMS: $(@address@hidden)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -31,6 +33,7 @@
else :; fi; \
done
+.PHONY uninstall-am: address@hidden@PROGRAMS
address@hidden@PROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(@address@hidden)'; for p in $$list; do \
Index: python.am
--- python.am Tue, 20 Feb 2001 20:28:16 +0100 akim (am/g/19_python.am 1.2 644)
+++ python.am Wed, 21 Feb 2001 20:30:35 +0100 akim (am/g/19_python.am 1.2 644)
@@ -16,6 +16,7 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+.PHONY install-exec-am: address@hidden@PYTHON
address@hidden@PYTHON: $(@address@hidden)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -30,6 +31,7 @@
## encoded in the actual files.
@PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(@address@hidden)
$(@address@hidden)
+.PHONY uninstall-am: address@hidden@PYTHON
address@hidden@PYTHON:
@$(NORMAL_UNINSTALL)
list='$(@address@hidden)'; for p in $$list; do \
Index: scripts.am
--- scripts.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/15_scripts.am 1.1 644)
+++ scripts.am Wed, 21 Feb 2001 20:31:24 +0100 akim (am/g/15_scripts.am 1.1 644)
@@ -15,6 +15,8 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
+.PHONY install-exec-am: address@hidden@SCRIPTS
address@hidden@SCRIPTS: $(@address@hidden)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(@address@hidden)
@@ -31,6 +33,7 @@
else :; fi; \
done
+.PHONY uninstall-am: address@hidden@SCRIPTS
address@hidden@SCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(@address@hidden)'; for p in $$list; do \
Index: texinfos.am
--- texinfos.am Fri, 09 Feb 2001 04:37:00 +0100 akim (am/g/10_texinfos.a 1.7
644)
+++ texinfos.am Wed, 21 Feb 2001 20:22:27 +0100 akim (am/g/10_texinfos.a 1.7
644)
@@ -138,6 +138,8 @@
## break a possible install-sh reference.
## Funny name due to --cygnus influence; we want to reserve
## `install-info' for the user.
+.PHONY: install-info-am
+?INSTALL-INFO?install-data-am: install-info-am
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(infodir)
@@ -173,6 +175,8 @@
done; \
else : ; fi
+.PHONY: uninstall-info
+?INSTALL-INFO?uninstall-am: uninstall-info
uninstall-info:
$(PRE_UNINSTALL)
## Run two loops here so that we can handle PRE_UNINSTALL and
@@ -195,6 +199,7 @@
else :; fi); \
done
+.PHONY: dist-info
dist-info: $(INFO_DEPS)
list='$(INFO_DEPS)'; \
for base in $$list; do \
@@ -207,8 +212,6 @@
|| cp -p $$d/$$file $(distdir)/$$file; \
done; \
done
-
-.PHONY: install-info-am uninstall-info
## How to clean. The funny name is due to --cygnus influence; in