summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2006-01-12 09:54:27 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2006-01-12 09:54:27 +0000
commit87b133a8ce4c0e2cd69de5209a89e6343f6d9eb3 (patch)
tree3e8d037c47311ca77049afa2df0bc029d5112c32
parentd623b59bebe9e6dd68681ae71084db38335d7841 (diff)
downloadrtems-87b133a8ce4c0e2cd69de5209a89e6343f6d9eb3.tar.bz2
2006-10-12 Ralf Corsepius <ralf.corsepius@rtems.org>
* ampolish3.in: Add all: for PREINSTALL_FILES. Add all-local for TMPINSTALL_FILES. Misc bug fixes.
Diffstat (limited to '')
-rw-r--r--tools/build/ChangeLog6
-rwxr-xr-xtools/build/ampolish3.in28
2 files changed, 24 insertions, 10 deletions
diff --git a/tools/build/ChangeLog b/tools/build/ChangeLog
index 17fdd01f57..29d818e879 100644
--- a/tools/build/ChangeLog
+++ b/tools/build/ChangeLog
@@ -1,5 +1,11 @@
2006-10-12 Ralf Corsepius <ralf.corsepius@rtems.org>
+ * ampolish3.in: Add all: for PREINSTALL_FILES.
+ Add all-local for TMPINSTALL_FILES.
+ Misc bug fixes.
+
+2006-10-12 Ralf Corsepius <ralf.corsepius@rtems.org>
+
* ampolish3.in: Check if Makefile.am already contains CLEANFILES or
DISTCLEANFILES.
diff --git a/tools/build/ampolish3.in b/tools/build/ampolish3.in
index 162a96a364..e86f6a8711 100755
--- a/tools/build/ampolish3.in
+++ b/tools/build/ampolish3.in
@@ -220,21 +220,29 @@ $output .= "endif\n\n";
foreach my $k ( keys %seen )
{
- $output .= "$k =\n";
- if ( $k =~ /.*FILES/o ) {
+ if ( $k =~ /PREINSTALL_FILES/o ) {
+ $output .= "all: \$(PREINSTALL_FILES) all-am\n\n";
+
+ $output .= "$k =\n";
$output .= "CLEANFILES ";
- if ( $predefs{"CLEANFILES"} ) {
- $output .= "+";
- $predefs{"CLEANFILES"} = 1;
- }
+ if ( $predefs{"CLEANFILES"} ) { $output .= "+"; }
$output .= "= \$($k)\n";
+ $predefs{"CLEANFILES"} = 1;
+ } elsif ( $k =~ /TMPINSTALL_FILES/o ) {
+
+ $output .= "all-local: \$(TMPINSTALL_FILES)\n\n";
+
+ $output .= "$k =\n";
+ $output .= "CLEANFILES ";
+ if ( $predefs{"CLEANFILES"} ) { $output .= "+"; }
+ $output .= "= \$($k)\n";
+ $predefs{"CLEANFILES"} = 1;
} elsif ( $k =~ /.*DIRS/o ) {
+ $output .= "$k =\n";
$output .= "DISTCLEANFILES ";
- if ( $predefs{"DISTCLEANFILES"} ) {
- $output .= "+";
- $predefs{"DISTCLEANFILES"} = 1;
- }
+ if ( $predefs{"DISTCLEANFILES"} ) { $output .= "+"; }
$output .= "= \$($k)\n";
+ $predefs{"DISTCLEANFILES"} = 1;
}
$output .= "\n";
}