From: Akim Demaille Date: Mon, 9 Apr 2001 14:23:07 +0000 (+0000) Subject: * automake.in (&am_install_var): Transform DIST, and let the *.am X-Git-Tag: handle-languages~90 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d5aaeaac07fb597d7a652834ba5ef598a4b5f7db;p=automake.git * 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 262d2265..54baaa38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-04-09 Akim Demaille + + * 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 * automake.in (%dist_common): Remove. diff --git a/automake.in b/automake.in index 9dfbd613..e05308a2 100755 --- 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 5df2feb6..32eb39db 100644 --- 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 0d6c15ee..add1ee48 100644 --- 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 42f4d8fe..88442cf6 100644 --- 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 5df2feb6..32eb39db 100644 --- 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 0d6c15ee..add1ee48 100644 --- 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 42f4d8fe..88442cf6 100644 --- 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 c3612169..95020755 100644 --- 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 62f4bf2c..904712d6 100644 --- 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 96b068dd..821aa268 100644 --- 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 c3612169..95020755 100644 --- 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 62f4bf2c..904712d6 100644 --- 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 96b068dd..821aa268 100644 --- 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. ## ## ---------- ##