* automake.in (&am_install_var): Transform DIST, and let the *.am

files handle DIST_COMMON.
* data.am, header.am, java.am, list.am, python.am, script.am: Set
DIST_COMMON.

diff --git a/ChangeLog b/ChangeLog
index 262d2265061bfd17ced3bffb8b3d22d5eeb6d402..54baaa38163f4142209b0b71984e608546af64f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&am_install_var): Transform DIST, and let the *.am
+       files handle DIST_COMMON.
+       * data.am, header.am, java.am, list.am, python.am, script.am: Set
+       DIST_COMMON.
+
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
        * automake.in (%dist_common): Remove.

diff --git a/automake.in b/automake.in
index 9dfbd613ed37c275c25516a6a31bc814c73a221f..e05308a2f78e8f7d3d6dd73751664d0cc554371b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7068,20 +7068,14 @@ sub am_install_var
                $X =~ s/^nobase_//;
            }
 
-           my $nodir_name;
+           my $nodir_name = $X;
            # If files should be distributed, do so.
+           my $dist_p = 0;
            if ($can_dist)
            {
-               if (($default_dist && $one_name !~ /^nodist_/)
-                   || (! $default_dist && $one_name =~ /^dist_/))
-               {
-                   &push_dist_common ('$(' . $one_name . ')');
-               }
-               ($nodir_name = $X) =~ s/^(dist|nodist)_//;
-           }
-           else
-           {
-               $nodir_name = $X;
+               $dist_p = (($default_dist && $one_name !~ /^nodist_/)
+                          || (! $default_dist && $one_name =~ /^dist_/));
+               $nodir_name =~ s/^(dist|nodist)_//;
            }
 
            # Append actual contents of where_PRIMARY variable to
@@ -7177,14 +7171,14 @@ sub am_install_var
            my $exec_p = (defined $exec_dir_p {$X}
                          ? $exec_dir_p {$X}
                          : ($X =~ /exec/));
-
            $output_rules .= &file_contents ($file,
                                             ('DIR'  => $X,
                                              'NDIR' => $nodir_name,
                                              'BASE' => $strip_subdir,
 
                                              'EXEC'    => $exec_p,
-                                             'INSTALL' => $install_p));
+                                             'INSTALL' => $install_p,
+                                             'DIST'    => $dist_p));
        }
     }
 

diff --git a/data.am b/data.am
index 5df2feb61caff30923f4cd78f3a8943308cb37e8..32eb39db91b9fc87a8cdba603c035b395e58ebf1 100644 (file)
--- a/data.am
+++ b/data.am
@@ -64,3 +64,12 @@ endif %?INSTALL%
 ## ---------- ##
 
 ## Nothing.
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_DATA)
+endif %?DIST%

diff --git a/header.am b/header.am
index 0d6c15eee029a86ea2242f32a866962311043845..add1ee4846be59997a59ebc1ddc47cd9542d4997 100644 (file)
--- a/header.am
+++ b/header.am
@@ -56,3 +56,12 @@ uninstall-%DIR%HEADERS:
          rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
        done
 endif %?INSTALL%
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_HEADERS)
+endif %?DIST%

diff --git a/java.am b/java.am
index 42f4d8fee3c654b27061536ffa08823545e396e3..88442cf64dfd50315de2805971811e7f8a0ef428 100644 (file)
--- a/java.am
+++ b/java.am
@@ -59,3 +59,12 @@ endif %?INSTALL%
 .PHONY clean-am: clean-%DIR%JAVA
 clean-%DIR%JAVA:
        -rm -f *.class class%DIR%.stamp
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_JAVA)
+endif %?DIST%

diff --git a/lib/am/data.am b/lib/am/data.am
index 5df2feb61caff30923f4cd78f3a8943308cb37e8..32eb39db91b9fc87a8cdba603c035b395e58ebf1 100644 (file)
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -64,3 +64,12 @@ endif %?INSTALL%
 ## ---------- ##
 
 ## Nothing.
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_DATA)
+endif %?DIST%

diff --git a/lib/am/header.am b/lib/am/header.am
index 0d6c15eee029a86ea2242f32a866962311043845..add1ee4846be59997a59ebc1ddc47cd9542d4997 100644 (file)
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -56,3 +56,12 @@ uninstall-%DIR%HEADERS:
          rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
        done
 endif %?INSTALL%
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_HEADERS)
+endif %?DIST%

diff --git a/lib/am/java.am b/lib/am/java.am
index 42f4d8fee3c654b27061536ffa08823545e396e3..88442cf64dfd50315de2805971811e7f8a0ef428 100644 (file)
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -59,3 +59,12 @@ endif %?INSTALL%
 .PHONY clean-am: clean-%DIR%JAVA
 clean-%DIR%JAVA:
        -rm -f *.class class%DIR%.stamp
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_JAVA)
+endif %?DIST%

diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index c3612169b3e284fecb44d27d476533897ecd7603..95020755863fc5716f9629585db03cd81c7784f2 100644 (file)
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -69,3 +69,12 @@ endif %?INSTALL%
 .PHONY clean-am: clean-lisp
 clean-lisp:
        -test -z "$(ELCFILES)" || rm -f $(ELCFILES)
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_LISP)
+endif %?DIST%

diff --git a/lib/am/python.am b/lib/am/python.am
index 62f4bf2cee913b1c0cafd9a74595856597110572..904712d6f945f712318aae16f1715aa0a44a6c4a 100644 (file)
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -66,3 +66,12 @@ endif %?INSTALL%
 .PHONY clean-am: clean-python
 clean-python:
        -test -z "$(PYCFILES)$(PYOFILES)" || rm -f $(PYCFILES) $(PYOFILES)
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_PYTHON)
+endif %?DIST%

diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 96b068dd68866e035357373d8fa057adb7cefc75..821aa2688a9c497e1a1f78f70a1d36f8b705a6ad 100644 (file)
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -43,6 +43,7 @@ install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
        done
 endif %?INSTALL%
 
+
 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##
@@ -59,6 +60,15 @@ uninstall-%DIR%SCRIPTS:
 endif %?INSTALL%
 
 
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_SCRIPTS)
+endif %?DIST%
+
+
 ## ---------- ##
 ## Checking.  ##
 ## ---------- ##

diff --git a/lisp.am b/lisp.am
index c3612169b3e284fecb44d27d476533897ecd7603..95020755863fc5716f9629585db03cd81c7784f2 100644 (file)
--- a/lisp.am
+++ b/lisp.am
@@ -69,3 +69,12 @@ endif %?INSTALL%
 .PHONY clean-am: clean-lisp
 clean-lisp:
        -test -z "$(ELCFILES)" || rm -f $(ELCFILES)
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_LISP)
+endif %?DIST%

diff --git a/python.am b/python.am
index 62f4bf2cee913b1c0cafd9a74595856597110572..904712d6f945f712318aae16f1715aa0a44a6c4a 100644 (file)
--- a/python.am
+++ b/python.am
@@ -66,3 +66,12 @@ endif %?INSTALL%
 .PHONY clean-am: clean-python
 clean-python:
        -test -z "$(PYCFILES)$(PYOFILES)" || rm -f $(PYCFILES) $(PYOFILES)
+
+
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_PYTHON)
+endif %?DIST%

diff --git a/scripts.am b/scripts.am
index 96b068dd68866e035357373d8fa057adb7cefc75..821aa2688a9c497e1a1f78f70a1d36f8b705a6ad 100644 (file)
--- a/scripts.am
+++ b/scripts.am
@@ -43,6 +43,7 @@ install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
        done
 endif %?INSTALL%
 
+
 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##
@@ -59,6 +60,15 @@ uninstall-%DIR%SCRIPTS:
 endif %?INSTALL%
 
 
+## -------------- ##
+## Distributing.  ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_SCRIPTS)
+endif %?DIST%
+
+
 ## ---------- ##
 ## Checking.  ##
 ## ---------- ##