[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03-remove-clean-am-files.patch
|
From: |
Akim Demaille |
|
Subject: |
03-remove-clean-am-files.patch |
|
Date: |
Sun, 04 Mar 2001 22:13:03 +0100 |
I do agree introducing ?INSTALL? obfuscates, but I still have if/fi in
mind. The reason I didn't implement if/fi support is that I want to
use the same as for Makefile.am, but improving it with support for
TRUE and FALSE directly, in which case there is no @FOO_TRUE@ etc. to
output, just statically perform the if.
So the plan is that we keep ?FOO? but instead of destroying ?FOO? will
evaluate to TRUE/FALSE and then the regular if/fi mechanism will be
usable. Why do I want the same if/fi mechanism? Because in fine, I
really see no reason to have two reading subs, and because I can't see
any reason for use not to be able to use the dynamic if/fi (would be
great with AMDEP for instance), and I see no reason for the user not
to be able to have static ifs.
I understand the fears from Tom about the robustness, but of course if
it file_contents which should become as robust as read_am_file, not
the latter becoming as weak as the former.
But before handling the conditionals, I still have things to
understand about them. Also, unconditional values should be seen as
conditional values, for instance corresponding to TRUE. Then, plenty
of code merges into a unified case.
Hence, there is still road to do before reaching if/fi in *.am files.
And I'm willing to clean the road before walking on it :)
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (&handle_programs, &handle_libraries, &handle_tags)
(&handle_ltlibraries, &handle_emacs_lisp, &handle_python): Adjust.
(&am_install_var): Forget about `-clean'.
Transform ?INSTALL?.
Always output the *.am file.
* data-clean.am, java-clean.am, libs-clean.am, lisp-clean.am,
* ltlib-clean.am, progs-clean.am, python-clean.am, tags-clean.am:
Remove, merged into the corresponding *.am file.
* data.am, libs.am, ltlib.am, progs.am, python.am: Equip with
?INSTALL?.
Index: Makefile.am
--- Makefile.am Sun, 04 Mar 2001 15:17:55 +0100 akim (am/f/46_Makefile.a 1.13
644)
+++ Makefile.am Sun, 04 Mar 2001 20:13:54 +0100 akim (am/f/46_Makefile.a 1.13
644)
@@ -10,14 +10,13 @@
bin_SCRIPTS = automake aclocal
info_TEXINFOS = automake.texi
-amfiles = all.am check.am clean-hdr.am clean-kr.am clean.am comp-vars.am \
-compile.am data-clean.am data.am dejagnu.am depend.am depend2.am \
-distdir.am footer.am header-vars.am header.am install.am \
-java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am \
-libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am \
-mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am \
-python.am python-clean.am remake-hdr.am remake.am scripts.am \
-subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am texibuild.am
+amfiles = all.am check.am clean-hdr.am clean-kr.am clean.am \
+comp-vars.am compile.am data.am dejagnu.am depend.am depend2.am \
+distdir.am footer.am header-vars.am header.am install.am java.am \
+kr-extra.am library.am libs.am libtool.am lisp.am ltlib.am \
+ltlibrary.am mans-vars.am mans.am multilib.am program.am progs.am \
+python.am remake-hdr.am remake.am scripts.am subdirs.am tags.am \
+texi-vers.am texinfos.am texibuild.am
dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
$(amfiles)
Index: Makefile.in
--- Makefile.in Sun, 04 Mar 2001 15:17:55 +0100 akim (am/h/16_Makefile.i 1.34
644)
+++ Makefile.in Sun, 04 Mar 2001 20:14:17 +0100 akim (am/h/16_Makefile.i 1.34
644)
@@ -84,14 +84,13 @@
bin_SCRIPTS = automake aclocal
info_TEXINFOS = automake.texi
-amfiles = all.am check.am clean-hdr.am clean-kr.am clean.am comp-vars.am \
-compile.am data-clean.am data.am dejagnu.am depend.am depend2.am \
-distdir.am footer.am header-vars.am header.am install.am \
-java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am \
-libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am \
-mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am \
-python.am python-clean.am remake-hdr.am remake.am scripts.am \
-subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am texibuild.am
+amfiles = all.am check.am clean-hdr.am clean-kr.am clean.am \
+comp-vars.am compile.am data.am dejagnu.am depend.am depend2.am \
+distdir.am footer.am header-vars.am header.am install.am java.am \
+kr-extra.am library.am libs.am libtool.am lisp.am ltlib.am \
+ltlibrary.am mans-vars.am mans.am multilib.am program.am progs.am \
+python.am remake-hdr.am remake.am scripts.am subdirs.am tags.am \
+texi-vers.am texinfos.am texibuild.am
dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
@@ -116,6 +115,8 @@
WGET = wget
FETCHFILES = config.guess config.sub
+EXEEXT =
+OBJEXT = o
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: automake.in
--- automake.in Sun, 04 Mar 2001 20:02:14 +0100 akim (am/f/39_automake.i 1.110
755)
+++ automake.in Sun, 04 Mar 2001 20:52:29 +0100 akim (am/f/39_automake.i 1.110
755)
@@ -2217,8 +2217,7 @@ sub check_canonical_spelling
# Handle C programs.
sub handle_programs
{
- my @proglist = &am_install_var ('-clean',
- 'progs', 'PROGRAMS',
+ my @proglist = &am_install_var ('progs', 'PROGRAMS',
'bin', 'sbin', 'libexec', 'pkglib',
'noinst', 'check');
return if ! @proglist;
@@ -2337,8 +2336,7 @@ sub handle_programs
# Handle libraries.
sub handle_libraries
{
- my @liblist = &am_install_var ('-clean',
- 'libs', 'LIBRARIES',
+ my @liblist = &am_install_var ('libs', 'LIBRARIES',
'lib', 'pkglib', 'noinst', 'check');
return if ! @liblist;
@@ -2435,8 +2433,7 @@ sub handle_libraries
# Handle shared libraries.
sub handle_ltlibraries
{
- my @liblist = &am_install_var ('-clean',
- 'ltlib', 'LTLIBRARIES',
+ my @liblist = &am_install_var ('ltlib', 'LTLIBRARIES',
'noinst', 'lib', 'pkglib', 'check');
return if ! @liblist;
@@ -2991,7 +2988,6 @@ sub handle_tags
&file_contents ('tags',
&transform ('CONFIG' => $config,
'DIRS' => join (' ', @tag_deps)));
- $output_rules .= &file_contents ('tags-clean');
&examine_variable ('TAGS_DEPENDENCIES');
}
elsif (&variable_defined ('TAGS_DEPENDENCIES'))
@@ -4158,7 +4154,7 @@ sub handle_tests
sub handle_emacs_lisp
{
my @elfiles = &am_install_var ('-candist', 'lisp', 'LISP',
- 'lisp', 'noinst');
+ 'lisp', 'noinst');
if (@elfiles)
{
@@ -4176,8 +4172,6 @@ sub handle_emacs_lisp
grep ($_ .= 'c', @elfiles);
&define_pretty_variable ('ELCFILES', '', @elfiles);
- $output_rules .= &file_contents ('lisp-clean');
-
my $varname;
if (&variable_defined ('lisp_LISP'))
{
@@ -4205,8 +4199,6 @@ sub handle_python
&define_configure_variable ('pythondir');
&define_configure_variable ('PYTHON');
- $output_rules .= &file_contents ('python-clean');
-
&am_error ("\`python_PYTHON' defined but \`AM_CHECK_PYTHON' not in
\`$configure_ac'")
if ! $seen_pythondir && &variable_defined ('python_PYTHON');
@@ -4223,7 +4215,7 @@ sub handle_python
# Handle Java.
sub handle_java
{
- my @sourcelist = &am_install_var ('-candist', '-clean',
+ my @sourcelist = &am_install_var ('-candist',
'java', 'JAVA',
'java', 'noinst', 'check');
return if ! @sourcelist;
@@ -6687,7 +6679,8 @@ sub file_contents
die "$me: installation error: cannot open \`$file'\n";
}
# Looks stupid?
- # print "$me: reading $file\n" if $verbose;
+ print "$me: reading $file\n"
+ if $verbose;
# Swallow into $CONTENTS the whole content of the file, after
# having performed the $COMMAND, and removed Automake comments.
@@ -6908,17 +6901,12 @@ sub am_install_var
{
my (@args) = @_;
- my $do_clean = 0;
my $do_require = 1;
my $can_dist = 0;
my $default_dist = 0;
while (@args)
{
- if ($args[0] eq '-clean')
- {
- $do_clean = 1;
- }
- elsif ($args[0] eq '-noextra')
+ if ($args[0] eq '-noextra')
{
$do_require = 0;
}
@@ -7102,13 +7090,6 @@ sub am_install_var
next;
}
- if ($do_clean)
- {
- $output_rules .=
- &file_contents ($file . '-clean',
- &transform ('DIR' => $X))
- }
-
if ($X eq 'check')
{
push (@check, '$(' . $one_name . ')');
@@ -7117,12 +7098,11 @@ sub am_install_var
{
push (@used, '$(' . $one_name . ')');
}
- if ($X eq 'noinst' || $X eq 'check')
- {
- # Objects which don't get installed by default.
- next;
- }
+ # Is this to be installed?
+ my $install_p = $X ne 'noinst' && $X ne 'check';
+
+ # If so, with install-exec? (or install-data?).
my $exec_p = (defined $exec_dir_p {$X}
? $exec_dir_p {$X}
: ($X =~ /exec/));
@@ -7132,7 +7112,9 @@ sub am_install_var
&transform ('DIR' => $X,
'NDIR' => $nodir_name,
'BASE' => $strip_subdir,
- 'EXEC' => $exec_p));
+
+ 'EXEC' => $exec_p,
+ 'INSTALL' => $install_p));
}
}
Index: data.am
--- data.am Sun, 04 Mar 2001 15:17:55 +0100 akim (am/g/46_data.am 1.8 644)
+++ data.am Sun, 04 Mar 2001 20:46:12 +0100 akim (am/g/46_data.am 1.8 644)
@@ -27,35 +27,41 @@
## Installing. ##
## ------------ ##
-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%DATA
-?!EXEC?.PHONY install-data-am: install-%DIR%DATA
-install-%DIR%DATA: $(%DIR%_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%DATA
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%DATA
+?INSTALL?install-%DIR%DATA: $(%DIR%_DATA)
+?INSTALL? @$(NORMAL_INSTALL)
+?INSTALL? $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
- @list='$(%DIR%_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+?INSTALL? @list='$(%DIR%_DATA)'; for p in $$list; do \
+?INSTALL? if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
## If the _DATA variable has an entry like foo/bar, install it as
## $(destdir)/bar, not $(destdir)/foo/bar. The user can always make a
## new dir variable for the latter case.
-?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE? f="$$p"; \
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
- done
+?INSTALL??BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \
+?INSTALL??!BASE? f="$$p"; \
+?INSTALL? echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL? $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL? done
## -------------- ##
## Uninstalling. ##
## -------------- ##
-.PHONY uninstall-am: uninstall-%DIR%DATA
-uninstall-%DIR%DATA:
- @$(NORMAL_UNINSTALL)
- @list='$(%DIR%_DATA)'; for p in $$list; do \
-?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE? f="$$p"; \
- echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
- rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
- done
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%DATA
+?INSTALL?uninstall-%DIR%DATA:
+?INSTALL? @$(NORMAL_UNINSTALL)
+?INSTALL? @list='$(%DIR%_DATA)'; for p in $$list; do \
+?INSTALL??BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \
+?INSTALL??!BASE? f="$$p"; \
+?INSTALL? echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL? rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL? done
+
+## ---------- ##
+## Cleaning. ##
+## ---------- ##
+
+## Nothing.
Index: java.am
--- java.am Sun, 04 Mar 2001 15:17:55 +0100 akim (am/g/36_java.am 1.4 644)
+++ java.am Sun, 04 Mar 2001 20:47:14 +0100 akim (am/g/36_java.am 1.4 644)
@@ -51,3 +51,12 @@
echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
done
+
+
+## ---------- ##
+## Cleaning. ##
+## ---------- ##
+
+.PHONY clean-am: clean-%DIR%JAVA:
+clean-%DIR%JAVA:
+ -rm *.class class%DIR%.stamp
Index: libs.am
--- libs.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/32_libs.am 1.4 644)
+++ libs.am Sun, 04 Mar 2001 20:47:14 +0100 akim (am/g/32_libs.am 1.4 644)
@@ -16,38 +16,56 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%LIBRARIES
-?!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES
-install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+## ------------ ##
+## Installing. ##
+## ------------ ##
+
+?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%LIBRARIES
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES
+?INSTALL?install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
+?INSTALL? @$(NORMAL_INSTALL)
+?INSTALL? $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
- @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
- else :; fi; \
- done
+?INSTALL? @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
+?INSTALL? if test -f $$p; then \
+?INSTALL? echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL? $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL? else :; fi; \
+?INSTALL? done
## We do two loops here so that $(POST_INSTALL) can be empty. If we
## merge the two loops, we get a syntax error from sh. Anyway, having
## $(POST_INSTALL) in the middle of the loop essentially renders it
## useless; sh never actually executes this command. Read the GNU
## Standards for a little enlightenment on this.
- @$(POST_INSTALL)
- @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
+?INSTALL? @$(POST_INSTALL)
+?INSTALL? @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
+?INSTALL? if test -f $$p; then \
## Must ranlib after installing because mod time changes.
- echo " $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p"; \
- $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p; \
- else :; fi; \
- done
-
-.PHONY uninstall-am: uninstall-%DIR%LIBRARIES
-uninstall-%DIR%LIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
- echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
- rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
- done
+?INSTALL? echo " $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL? $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL? else :; fi; \
+?INSTALL? done
+
+
+## -------------- ##
+## Uninstalling. ##
+## -------------- ##
+
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%LIBRARIES
+?INSTALL?uninstall-%DIR%LIBRARIES:
+?INSTALL? @$(NORMAL_UNINSTALL)
+?INSTALL? @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
+?INSTALL? echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL? rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL? done
+
+
+## ---------- ##
+## Cleaning. ##
+## ---------- ##
+
+.PHONY clean-am: clean-%DIR%LIBRARIES
+clean-%DIR%LIBRARIES:
+ -test -z "$(%DIR%_LIBRARIES)" || rm -f $(%DIR%_LIBRARIES)
Index: lisp.am
--- lisp.am Sun, 04 Mar 2001 15:17:55 +0100 akim (am/g/29_lisp.am 1.9 644)
+++ lisp.am Sun, 04 Mar 2001 20:47:14 +0100 akim (am/g/29_lisp.am 1.9 644)
@@ -48,9 +48,10 @@
else : ; fi; \
done
-## ------------- ##
-## Uninstallin. ##
-## ------------- ##
+
+## -------------- ##
+## Uninstalling. ##
+## -------------- ##
.PHONY uninstall-am: uninstall-%DIR%LISP
uninstall-%DIR%LISP:
@@ -61,3 +62,12 @@
echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
done
+
+
+## ---------- ##
+## Cleaning. ##
+## ---------- ##
+
+.PHONY clean-am: clean-lisp
+clean-lisp:
+ -test -z "$(ELCFILES)" || rm -f $(ELCFILES)
Index: ltlib.am
--- ltlib.am Thu, 01 Mar 2001 22:55:36 +0100 akim (am/g/27_ltlib.am 1.5 644)
+++ ltlib.am Sun, 04 Mar 2001 20:47:14 +0100 akim (am/g/27_ltlib.am 1.5 644)
@@ -17,33 +17,50 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%LTLIBRARIES
-?!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES
-install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+## ------------ ##
+## Installing. ##
+## ------------ ##
+
+?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%LTLIBRARIES
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES
+?INSTALL?install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
+?INSTALL? @$(NORMAL_INSTALL)
+?INSTALL? $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
- @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
+?INSTALL? @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
+?INSTALL? if test -f $$p; then \
## Note that we explicitly set the libtool mode. This avoids any lossage
## if the program doesn't have a name that libtool expects.
## Use INSTALL and not INSTALL_DATA because libtool knows the right
## permissions to use.
-?LIBTOOL? echo " $(LIBTOOL) --mode=install $(INSTALL)
$(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?LIBTOOL? $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG)
$$p $(DESTDIR)$(%NDIR%dir)/$$p; \
-?!LIBTOOL? echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$p
$(DESTDIR)$(%NDIR%dir)/$$p"; \
-?!LIBTOOL? $(INSTALL) $(INSTALL_STRIP_FLAG) $$p
$(DESTDIR)$(%NDIR%dir)/$$p; \
- else :; fi; \
- done
-
-.PHONY uninstall-am: uninstall-%DIR%LTLIBRARIES
-uninstall-%DIR%LTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
-?LIBTOOL? echo " $(LIBTOOL) --mode=uninstall rm -f
$(DESTDIR)$(%NDIR%dir)/$$p"; \
-?LIBTOOL? $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(%NDIR%dir)/$$p;
\
-?!LIBTOOL? echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?!LIBTOOL? rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
- done
+?INSTALL??LIBTOOL? echo " $(LIBTOOL) --mode=install $(INSTALL)
$(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL??LIBTOOL? $(LIBTOOL) --mode=install $(INSTALL)
$(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL??!LIBTOOL? echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$p
$(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL??!LIBTOOL? $(INSTALL) $(INSTALL_STRIP_FLAG) $$p
$(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL? else :; fi; \
+?INSTALL? done
+
+## -------------- ##
+## Uninstalling. ##
+## -------------- ##
+
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%LTLIBRARIES
+?INSTALL?uninstall-%DIR%LTLIBRARIES:
+?INSTALL? @$(NORMAL_UNINSTALL)
+?INSTALL? @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
+?INSTALL??LIBTOOL? echo " $(LIBTOOL) --mode=uninstall rm -f
$(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL??LIBTOOL? $(LIBTOOL) --mode=uninstall rm -f
$(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL??!LIBTOOL? echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL??!LIBTOOL? rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL? done
+
+
+## ---------- ##
+## Cleaning. ##
+## ---------- ##
+
+.PHONY clean-am: clean-%DIR%LTLIBRARIES
+clean-%DIR%LTLIBRARIES:
+ -test -z "$(%DIR%_LTLIBRARIES)" || rm -f $(%DIR%_LTLIBRARIES)
Index: progs.am
--- progs.am Sun, 04 Mar 2001 20:02:14 +0100 akim (am/g/20_progs.am 1.6 644)
+++ progs.am Sun, 04 Mar 2001 20:47:14 +0100 akim (am/g/20_progs.am 1.6 644)
@@ -22,37 +22,46 @@
## Installing. ##
## ------------ ##
-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%PROGRAMS
-?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS
-install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%PROGRAMS
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS
+?INSTALL?install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
+?INSTALL? @$(NORMAL_INSTALL)
+?INSTALL? $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
- @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
+?INSTALL? @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
+?INSTALL? if test -f $$p; then \
## Note that we explicitly set the libtool mode. This avoids any
## lossage if the install program doesn't have a name that libtool
## expects.
- f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-?LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-?LIBTOOL? $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-?!LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p
$(DESTDIR)$(%NDIR%dir)/$$f"; \
-?!LIBTOOL? $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p
$(DESTDIR)$(%NDIR%dir)/$$f; \
- else :; fi; \
- done
+?INSTALL? f=`echo $$p|sed
's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+?INSTALL??LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL)
--mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL??LIBTOOL? $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL??!LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p
$(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL??!LIBTOOL? $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p
$(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL? else :; fi; \
+?INSTALL? done
## -------------- ##
-## uninstalling. ##
+## Uninstalling. ##
## -------------- ##
-.PHONY uninstall-am: uninstall-%DIR%PROGRAMS
-uninstall-%DIR%PROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
- rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
- done
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%PROGRAMS
+?INSTALL?uninstall-%DIR%PROGRAMS:
+?INSTALL? @$(NORMAL_UNINSTALL)
+?INSTALL? @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
+?INSTALL? f=`echo $$p|sed
's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+?INSTALL? echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL? rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL? done
+
+
+## ---------- ##
+## Cleaning. ##
+## ---------- ##
+
+.PHONY clean-am: clean-%DIR%PROGRAMS
+clean-%DIR%PROGRAMS:
+ -test -z "$(%DIR%_PROGRAMS)" || rm -f $(%DIR%_PROGRAMS)
Index: python.am
--- python.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/19_python.am 1.5 644)
+++ python.am Sun, 04 Mar 2001 20:47:14 +0100 akim (am/g/19_python.am 1.5 644)
@@ -16,30 +16,48 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-_am_installdirs += $(DESTDIR)$(%DIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%PYTHON
-?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON
-install-%DIR%PYTHON: $(%DIR%_PYTHON)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(%DIR%dir)
- @list='$(%DIR%_PYTHON)'; for p in $$list; do\
- if test -f $(srcdir)/$$p; then \
+
+## ------------ ##
+## Installing. ##
+## ------------ ##
+
+?INSTALL?_am_installdirs += $(DESTDIR)$(%DIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%PYTHON
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%PYTHON
+?INSTALL?install-%DIR%PYTHON: $(%DIR%_PYTHON)
+?INSTALL? @$(NORMAL_INSTALL)
+?INSTALL? $(mkinstalldirs) $(DESTDIR)$(%DIR%dir)
+?INSTALL? @list='$(%DIR%_PYTHON)'; for p in $$list; do\
+?INSTALL? if test -f $(srcdir)/$$p; then \
## Don't perform translation, since script name is important.
- echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p";
\
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p; \
- else :; fi; \
- done
+?INSTALL? echo " $(INSTALL_PROGRAM) $(srcdir)/$$p
$(DESTDIR)$(%DIR%dir)/$$p"; \
+?INSTALL? $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p; \
+?INSTALL? else :; fi; \
+?INSTALL? done
## Byte-compile must be done at install time, since file times are
## encoded in the actual files.
- @PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(%DIR%dir)
$(%DIR%_PYTHON)
+?INSTALL? @PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(%DIR%dir)
$(%DIR%_PYTHON)
+
-.PHONY uninstall-am: uninstall-%DIR%PYTHON
-uninstall-%DIR%PYTHON:
- @$(NORMAL_UNINSTALL)
- list='$(%DIR%_PYTHON)'; for p in $$list; do \
- rm -f $(DESTDIR)$(%DIR%dir)/$$p; \
+## -------------- ##
+## Uninstalling. ##
+## -------------- ##
+
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%PYTHON
+?INSTALL?uninstall-%DIR%PYTHON:
+?INSTALL? @$(NORMAL_UNINSTALL)
+?INSTALL? list='$(%DIR%_PYTHON)'; for p in $$list; do \
+?INSTALL? rm -f $(DESTDIR)$(%DIR%dir)/$$p; \
## This is to remove the .pyc and .pyo byte compiled versions (a bit
## of a hack).
- rm -f $(DESTDIR)$(%DIR%dir)/$${p}c; \
- rm -f $(DESTDIR)$(%DIR%dir)/$${p}o; \
- done
+?INSTALL? rm -f $(DESTDIR)$(%DIR%dir)/$${p}c; \
+?INSTALL? rm -f $(DESTDIR)$(%DIR%dir)/$${p}o; \
+?INSTALL? done
+
+## ---------- ##
+## Cleaning. ##
+## ---------- ##
+
+.PHONY clean-am: clean-python
+clean-python:
+ -test -z "$(PYCFILES)$(PYOFILES)" || rm -f $(PYCFILES) $(PYOFILES)
Index: tags.am
--- tags.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/12_tags.am 1.4 644)
+++ tags.am Sun, 04 Mar 2001 20:47:14 +0100 akim (am/g/12_tags.am 1.4 644)
@@ -16,8 +16,15 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+
+.PHONY: tags
tags: TAGS
+
+## ---- ##
+## ID. ##
+## ---- ##
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
## Make sure the list of sources is unique.
list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
@@ -29,6 +36,11 @@
END { for (i in files) print i; }'`; \
mkid -fID $$unique $(LISP)
+
+## ------ ##
+## TAGS. ##
+## ------ ##
+
TAGS: %DIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -51,10 +63,22 @@
test -z "$(ETAGS_ARGS)%CONFIG%$$unique$(LISP)$$tags" \
|| etags $(ETAGS_ARGS) $$tags %CONFIG% $$unique $(LISP)
-## Support `Global' tags.
+
+## --------------- ##
+## `Global' tags. ##
+## --------------- ##
+
GTAGS:
here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $$here
-.PHONY: tags
+
+## ---------- ##
+## Cleaning. ##
+## ---------- ##
+
+.PHONY distclean-am: distclean-tags
+
+distclean-tags:
+ -rm -f TAGS ID
Index: m4/Makefile.in
--- m4/Makefile.in Sun, 04 Mar 2001 15:17:55 +0100 akim (am/h/15_Makefile.i
1.26 644)
+++ m4/Makefile.in Sun, 04 Mar 2001 20:14:18 +0100 akim (am/h/15_Makefile.i
1.26 644)
@@ -88,6 +88,8 @@
EXTRA_DIST = $(m4data_DATA)
+EXEEXT =
+OBJEXT = o
subdir = m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
Index: tests/Makefile.in
--- tests/Makefile.in Sun, 04 Mar 2001 15:17:55 +0100 akim (am/h/14_Makefile.i
1.29 644)
+++ tests/Makefile.in Sun, 04 Mar 2001 20:14:18 +0100 akim (am/h/14_Makefile.i
1.29 644)
@@ -357,6 +357,8 @@
EXTRA_DIST = defs ChangeLog-old $(TESTS)
+EXEEXT =
+OBJEXT = o
subdir = tests
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
Index: data-clean.am
--- data-clean.am Wed, 21 Feb 2001 19:38:18 +0100 akim (am/g/47_data-clean 1.2
644)
+++ data-clean.am Sun, 04 Mar 2001 20:53:16 +0100 akim ()
@@ -1,19 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-
-## FIXME: This file must exist, even though it is empty.
Index: java-clean.am
--- java-clean.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/37_java-clean 1.3
644)
+++ java-clean.am Sun, 04 Mar 2001 20:53:16 +0100 akim ()
@@ -1,21 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright 1998, 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-
-.PHONY clean-am: clean-%DIR%JAVA:
-clean-%DIR%JAVA:
- -rm *.class class%DIR%.stamp
Index: libs-clean.am
--- libs-clean.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/33_libs-clean 1.3
644)
+++ libs-clean.am Sun, 04 Mar 2001 20:53:16 +0100 akim ()
@@ -1,21 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-
-.PHONY clean-am: clean-%DIR%LIBRARIES
-clean-%DIR%LIBRARIES:
- -test -z "$(%DIR%_LIBRARIES)" || rm -f $(%DIR%_LIBRARIES)
Index: lisp-clean.am
--- lisp-clean.am Wed, 21 Feb 2001 19:38:18 +0100 akim (am/g/30_lisp-clean 1.3
644)
+++ lisp-clean.am Sun, 04 Mar 2001 20:53:16 +0100 akim ()
@@ -1,21 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-
-.PHONY clean-am: clean-lisp
-clean-lisp:
- -test -z "$(ELCFILES)" || rm -f $(ELCFILES)
Index: ltlib-clean.am
--- ltlib-clean.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/28_ltlib-clea 1.3
644)
+++ ltlib-clean.am Sun, 04 Mar 2001 20:53:16 +0100 akim ()
@@ -1,21 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright 1997, 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-
-.PHONY clean-am: clean-%DIR%LTLIBRARIES
-clean-%DIR%LTLIBRARIES:
- -test -z "$(%DIR%_LTLIBRARIES)" || rm -f $(%DIR%_LTLIBRARIES)
Index: progs-clean.am
--- progs-clean.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/21_progs-clea 1.3
644)
+++ progs-clean.am Sun, 04 Mar 2001 20:53:16 +0100 akim ()
@@ -1,21 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1997, 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-
-.PHONY clean-am: clean-%DIR%PROGRAMS
-clean-%DIR%PROGRAMS:
- -test -z "$(%DIR%_PROGRAMS)" || rm -f $(%DIR%_PROGRAMS)
Index: python-clean.am
--- python-clean.am Wed, 21 Feb 2001 19:38:18 +0100 akim (am/g/18_python-cle
1.3 644)
+++ python-clean.am Sun, 04 Mar 2001 20:53:16 +0100 akim ()
@@ -1,22 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## Copyright 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-
-.PHONY clean-am: clean-python
-clean-python:
- -test -z "$(PYCFILES)" || rm -f $(PYCFILES)
- -test -z "$(PYOFILES)" || rm -f $(PYOFILES)
Index: tags-clean.am
--- tags-clean.am Mon, 26 Feb 2001 23:44:40 +0100 akim (am/g/13_tags-clean 1.4
644)
+++ tags-clean.am Sun, 04 Mar 2001 20:53:16 +0100 akim ()
@@ -1,29 +0,0 @@
-## automake - create Makefile.in from Makefile.am
-## 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-
-## The GNU Standards mandates that tags files be removed by
-## maintainer-clean. But I'm told (by François Pinard) that this is
-## really because RMS usually includes TAGS files in his
-## distributions. Since we do not, we instead have "distclean" remove
-## them. The rule is: if the user built it, "distclean" removes it.
-## If it is shipped, "maintainer-clean" removes it.
-
-.PHONY distclean-am: distclean-tags
-
-distclean-tags:
- -rm -f TAGS ID
Index: java.am
--- java.am Sun, 04 Mar 2001 21:00:13 +0100 akim (am/g/36_java.am 1.5 644)
+++ java.am Sun, 04 Mar 2001 21:23:56 +0100 akim (am/g/36_java.am 1.5 644)
@@ -26,31 +26,31 @@
## Installing. ##
## ------------ ##
-?EXEC?.PHONY install-exec-am: install-%DIR%JAVA
-?!EXEC?.PHONY install-data-am: install-%DIR%JAVA
-install-%DIR%JAVA: class%DIR%.stamp
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%JAVA
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%JAVA
+?INSTALL?install-%DIR%JAVA: class%DIR%.stamp
+?INSTALL? @$(NORMAL_INSTALL)
+?INSTALL? $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
## A single .java file can be compiled into multiple .class files. So
## we just install all the .class files that got built into this
## directory. This is not optimal, but will have to do for now.
- for p in *.class; do \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
- done
+?INSTALL? for p in *.class; do \
+?INSTALL? echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL? $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL? done
## -------------- ##
## Uninstalling. ##
## -------------- ##
-.PHONY uninstall-am: uninstall-%DIR%JAVA
-uninstall-%DIR%JAVA:
- @$(NORMAL_UNINSTALL)
- @for p in *.class; do \
- echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
- rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
- done
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%JAVA
+?INSTALL?uninstall-%DIR%JAVA:
+?INSTALL? @$(NORMAL_UNINSTALL)
+?INSTALL? @for p in *.class; do \
+?INSTALL? echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?INSTALL? rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+?INSTALL? done
## ---------- ##
- 03-remove-clean-am-files.patch,
Akim Demaille <=