* automake.in (&handle_programs, &handle_libraries, &handle_tags)
authorAkim Demaille <akim@epita.fr>
Mon, 5 Mar 2001 18:47:49 +0000 (18:47 +0000)
committerAkim Demaille <akim@epita.fr>
Mon, 5 Mar 2001 18:47:49 +0000 (18:47 +0000)
(&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?.

28 files changed:
ChangeLog
Makefile.am
automake.in
data-clean.am [deleted file]
data.am
java-clean.am [deleted file]
java.am
lib/am/Makefile.am
lib/am/data.am
lib/am/java.am
lib/am/libs.am
lib/am/lisp.am
lib/am/ltlib.am
lib/am/progs.am
lib/am/python.am
lib/am/tags.am
libs-clean.am [deleted file]
libs.am
lisp-clean.am [deleted file]
lisp.am
ltlib-clean.am [deleted file]
ltlib.am
progs-clean.am [deleted file]
progs.am
python-clean.am [deleted file]
python.am
tags-clean.am [deleted file]
tags.am

index 86b2b4c..82f85b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+       * 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?.
+
 2001-03-05  Pavel Roskin  <proski@gnu.org>
 
        * Makefile.am (amfiles): Add configure.am. Sort alphabetically.
index 857245d..579a641 100644 (file)
@@ -11,13 +11,12 @@ bin_SCRIPTS = automake aclocal
 info_TEXINFOS = automake.texi
 
 amfiles = check.am clean-hdr.am clean-kr.am clean.am comp-vars.am \
-compile.am configure.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-clean.am python.am remake-hdr.am remake.am scripts.am \
-subdirs.am tags-clean.am tags.am texi-vers.am texibuild.am texinfos.am
+compile.am configure.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 texibuild.am texinfos.am
 
 dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
 $(amfiles)
index 68d1532..14eab55 100755 (executable)
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!@PERL@
 # -*- perl -*-
 # @configure_input@
 
@@ -2133,8 +2133,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;
@@ -2253,8 +2252,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;
 
@@ -2351,8 +2349,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;
 
@@ -2911,7 +2908,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'))
@@ -4146,7 +4142,7 @@ sub handle_tests
 sub handle_emacs_lisp
 {
     my @elfiles = &am_install_var ('-candist', 'lisp', 'LISP',
-                                       'lisp', 'noinst');
+                                  'lisp', 'noinst');
 
     if (@elfiles)
     {
@@ -4164,8 +4160,6 @@ sub handle_emacs_lisp
        grep ($_ .= 'c', @elfiles);
        &define_pretty_variable ('ELCFILES', '', @elfiles);
 
-       $output_rules .= &file_contents ('lisp-clean');
-
        push (@all, '$(ELCFILES)');
 
        my $varname;
@@ -4195,8 +4189,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');
 
@@ -4213,7 +4205,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;
@@ -6682,7 +6674,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.
@@ -6903,17 +6896,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;
        }
@@ -7097,13 +7085,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 . ')');
@@ -7112,12 +7093,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/));
@@ -7127,7 +7107,9 @@ sub am_install_var
                              &transform ('DIR'  => $X,
                                          'NDIR' => $nodir_name,
                                          'BASE' => $strip_subdir,
-                                         'EXEC' => $exec_p));
+
+                                         'EXEC'    => $exec_p,
+                                         'INSTALL' => $install_p));
        }
     }
 
diff --git a/data-clean.am b/data-clean.am
deleted file mode 100644 (file)
index 9e2a13d..0000000
+++ /dev/null
@@ -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.
diff --git a/data.am b/data.am
index 0e92596..fe80e8f 100644 (file)
--- a/data.am
+++ b/data.am
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-_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)
+## ------------ ##
+## Installing.  ##
+## ------------ ##
+
+?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
-
-.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??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.  ##
+## -------------- ##
+
+?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.
diff --git a/java-clean.am b/java-clean.am
deleted file mode 100644 (file)
index b28848d..0000000
+++ /dev/null
@@ -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
diff --git a/java.am b/java.am
index e7753b1..d460a85 100644 (file)
--- a/java.am
+++ b/java.am
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-?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)
+## ------------ ##
+## Installing.  ##
+## ------------ ##
+
+?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
-
-.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?      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.  ##
+## -------------- ##
+
+?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
+
+
+## ---------- ##
+## Cleaning.  ##
+## ---------- ##
+
+.PHONY clean-am: clean-%DIR%JAVA:
+clean-%DIR%JAVA:
+       -rm *.class class%DIR%.stamp
index 857245d..579a641 100644 (file)
@@ -11,13 +11,12 @@ bin_SCRIPTS = automake aclocal
 info_TEXINFOS = automake.texi
 
 amfiles = check.am clean-hdr.am clean-kr.am clean.am comp-vars.am \
-compile.am configure.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-clean.am python.am remake-hdr.am remake.am scripts.am \
-subdirs.am tags-clean.am tags.am texi-vers.am texibuild.am texinfos.am
+compile.am configure.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 texibuild.am texinfos.am
 
 dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
 $(amfiles)
index 0e92596..fe80e8f 100644 (file)
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-_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)
+## ------------ ##
+## Installing.  ##
+## ------------ ##
+
+?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
-
-.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??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.  ##
+## -------------- ##
+
+?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 e7753b1..d460a85 100644 (file)
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-?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)
+## ------------ ##
+## Installing.  ##
+## ------------ ##
+
+?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
-
-.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?      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.  ##
+## -------------- ##
+
+?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
+
+
+## ---------- ##
+## Cleaning.  ##
+## ---------- ##
+
+.PHONY clean-am: clean-%DIR%JAVA:
+clean-%DIR%JAVA:
+       -rm *.class class%DIR%.stamp
index ea5db3a..77e0e7b 100644 (file)
 ## 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 19aaf9f..d062df0 100644 (file)
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%LISP
-?!EXEC?.PHONY install-data-am: install-%DIR%LISP
-install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+## ------------ ##
+## Installing.  ##
+## ------------ ##
+
+?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%LISP
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%LISP
+?INSTALL?install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
+?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%_LISP)'; for p in $$list; do \
+?INSTALL?      @list='$(%DIR%_LISP)'; for p in $$list; do \
 ## A lisp file can be in the source directory or the build directory.
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-?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; \
+?INSTALL?        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+?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; \
 ## Only install .elc file if it exists.
-         if test -f $${p}c; then \
-           echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
-           $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \
-         else : ; fi; \
-       done
-
-.PHONY uninstall-am: uninstall-%DIR%LISP
-uninstall-%DIR%LISP:
-       @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_LISP)'; for p in $$list; do \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
-         rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
-       done
+?INSTALL?        if test -f $${p}c; then \
+?INSTALL?          echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+?INSTALL?          $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \
+?INSTALL?        else : ; fi; \
+?INSTALL?      done
+
+
+## -------------- ##
+## Uninstalling.  ##
+## -------------- ##
+
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%LISP
+?INSTALL?uninstall-%DIR%LISP:
+?INSTALL?      @$(NORMAL_UNINSTALL)
+?INSTALL?      @list='$(%DIR%_LISP)'; for p in $$list; do \
+?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
+?INSTALL??!BASE?         f="$$p"; \
+?INSTALL?        echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
+?INSTALL?      done
+
+
+## ---------- ##
+## Cleaning.  ##
+## ---------- ##
+
+.PHONY clean-am: clean-lisp
+clean-lisp:
+       -test -z "$(ELCFILES)" || rm -f $(ELCFILES)
index 4ed93d9..38c1db2 100644 (file)
 ## 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 1fefdac..11692cf 100644 (file)
 ## 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 959e3e2..502c928 100644 (file)
 ## 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 d96b3fa..7dbabde 100644 (file)
 ## 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 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
               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 @@ TAGS: %DIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
        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
diff --git a/libs-clean.am b/libs-clean.am
deleted file mode 100644 (file)
index 2a45031..0000000
+++ /dev/null
@@ -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)
diff --git a/libs.am b/libs.am
index ea5db3a..77e0e7b 100644 (file)
--- a/libs.am
+++ b/libs.am
 ## 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)
diff --git a/lisp-clean.am b/lisp-clean.am
deleted file mode 100644 (file)
index 0affb79..0000000
+++ /dev/null
@@ -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)
diff --git a/lisp.am b/lisp.am
index 19aaf9f..d062df0 100644 (file)
--- a/lisp.am
+++ b/lisp.am
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%LISP
-?!EXEC?.PHONY install-data-am: install-%DIR%LISP
-install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+## ------------ ##
+## Installing.  ##
+## ------------ ##
+
+?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%LISP
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%LISP
+?INSTALL?install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
+?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%_LISP)'; for p in $$list; do \
+?INSTALL?      @list='$(%DIR%_LISP)'; for p in $$list; do \
 ## A lisp file can be in the source directory or the build directory.
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-?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; \
+?INSTALL?        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+?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; \
 ## Only install .elc file if it exists.
-         if test -f $${p}c; then \
-           echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
-           $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \
-         else : ; fi; \
-       done
-
-.PHONY uninstall-am: uninstall-%DIR%LISP
-uninstall-%DIR%LISP:
-       @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_LISP)'; for p in $$list; do \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
-         rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
-       done
+?INSTALL?        if test -f $${p}c; then \
+?INSTALL?          echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+?INSTALL?          $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \
+?INSTALL?        else : ; fi; \
+?INSTALL?      done
+
+
+## -------------- ##
+## Uninstalling.  ##
+## -------------- ##
+
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%LISP
+?INSTALL?uninstall-%DIR%LISP:
+?INSTALL?      @$(NORMAL_UNINSTALL)
+?INSTALL?      @list='$(%DIR%_LISP)'; for p in $$list; do \
+?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
+?INSTALL??!BASE?         f="$$p"; \
+?INSTALL?        echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
+?INSTALL?      done
+
+
+## ---------- ##
+## Cleaning.  ##
+## ---------- ##
+
+.PHONY clean-am: clean-lisp
+clean-lisp:
+       -test -z "$(ELCFILES)" || rm -f $(ELCFILES)
diff --git a/ltlib-clean.am b/ltlib-clean.am
deleted file mode 100644 (file)
index 1f7a014..0000000
+++ /dev/null
@@ -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 4ed93d9..38c1db2 100644 (file)
--- a/ltlib.am
+++ b/ltlib.am
 ## 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)
diff --git a/progs-clean.am b/progs-clean.am
deleted file mode 100644 (file)
index 8a678f4..0000000
+++ /dev/null
@@ -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 1fefdac..11692cf 100644 (file)
--- a/progs.am
+++ b/progs.am
 ## 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)
diff --git a/python-clean.am b/python-clean.am
deleted file mode 100644 (file)
index 34879f0..0000000
+++ /dev/null
@@ -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 959e3e2..502c928 100644 (file)
--- a/python.am
+++ b/python.am
 ## 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)
diff --git a/tags-clean.am b/tags-clean.am
deleted file mode 100644 (file)
index e17b85a..0000000
+++ /dev/null
@@ -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
diff --git a/tags.am b/tags.am
index d96b3fa..7dbabde 100644 (file)
--- a/tags.am
+++ b/tags.am
 ## 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 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
               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 @@ TAGS: %DIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
        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