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 (&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.
(%configure_dist_common): Replace with...
($configure_dist_common): this.
$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
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));
}
}
## ---------- ##
## Nothing.
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_DATA)
+endif %?DIST%
rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
done
endif %?INSTALL%
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_HEADERS)
+endif %?DIST%
.PHONY clean-am: clean-%DIR%JAVA
clean-%DIR%JAVA:
-rm -f *.class class%DIR%.stamp
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_JAVA)
+endif %?DIST%
## ---------- ##
## Nothing.
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_DATA)
+endif %?DIST%
rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
done
endif %?INSTALL%
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_HEADERS)
+endif %?DIST%
.PHONY clean-am: clean-%DIR%JAVA
clean-%DIR%JAVA:
-rm -f *.class class%DIR%.stamp
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_JAVA)
+endif %?DIST%
.PHONY clean-am: clean-lisp
clean-lisp:
-test -z "$(ELCFILES)" || rm -f $(ELCFILES)
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_LISP)
+endif %?DIST%
.PHONY clean-am: clean-python
clean-python:
-test -z "$(PYCFILES)$(PYOFILES)" || rm -f $(PYCFILES) $(PYOFILES)
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_PYTHON)
+endif %?DIST%
done
endif %?INSTALL%
+
## -------------- ##
## Uninstalling. ##
## -------------- ##
endif %?INSTALL%
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_SCRIPTS)
+endif %?DIST%
+
+
## ---------- ##
## Checking. ##
## ---------- ##
.PHONY clean-am: clean-lisp
clean-lisp:
-test -z "$(ELCFILES)" || rm -f $(ELCFILES)
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_LISP)
+endif %?DIST%
.PHONY clean-am: clean-python
clean-python:
-test -z "$(PYCFILES)$(PYOFILES)" || rm -f $(PYCFILES) $(PYOFILES)
+
+
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_PYTHON)
+endif %?DIST%
done
endif %?INSTALL%
+
## -------------- ##
## Uninstalling. ##
## -------------- ##
endif %?INSTALL%
+## -------------- ##
+## Distributing. ##
+## -------------- ##
+
+if %?DIST%
+DIST_COMMON += $(%DIR%_SCRIPTS)
+endif %?DIST%
+
+
## ---------- ##
## Checking. ##
## ---------- ##