diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-01-14 06:10:51 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-01-14 06:10:51 +0000 |
| commit | a09b068cfcc8099ad80a6bb86f516e226b640d6e (patch) | |
| tree | 2887b29368458aa223bc4d16317fb63d22a3b972 | |
| parent | 2006-01-13 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-a09b068cfcc8099ad80a6bb86f516e226b640d6e.tar.bz2 | |
2006-10-14 Ralf Corsepius <ralf.corsepius@rtems.org>
* ampolish3.in: Check Makefile.am for SUBDIRS.
Add all-am: for PREINSTALL_FILES.
| -rw-r--r-- | tools/build/ChangeLog | 5 | ||||
| -rwxr-xr-x | tools/build/ampolish3.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/build/ChangeLog b/tools/build/ChangeLog index 29d818e879..4d4cf19677 100644 --- a/tools/build/ChangeLog +++ b/tools/build/ChangeLog @@ -1,3 +1,8 @@ +2006-10-14 Ralf Corsepius <ralf.corsepius@rtems.org> + + * ampolish3.in: Check Makefile.am for SUBDIRS. + Add all-am: for PREINSTALL_FILES. + 2006-10-12 Ralf Corsepius <ralf.corsepius@rtems.org> * ampolish3.in: Add all: for PREINSTALL_FILES. diff --git a/tools/build/ampolish3.in b/tools/build/ampolish3.in index e86f6a8711..44760761f1 100755 --- a/tools/build/ampolish3.in +++ b/tools/build/ampolish3.in @@ -106,7 +106,7 @@ foreach my $l ( @buffer1 ) { } # Check if Makefile.am already contains CLEANFILES or DISTCLEANFILES - if ( $l =~ /^\s*(CLEANFILES|DISTCLEANFILES)\s*\=.*$/o ) + if ( $l =~ /^\s*(CLEANFILES|DISTCLEANFILES|SUBDIRS)\s*\=.*$/o ) { $predefs{"$1"} = 1; } @@ -221,7 +221,7 @@ $output .= "endif\n\n"; foreach my $k ( keys %seen ) { if ( $k =~ /PREINSTALL_FILES/o ) { - $output .= "all: \$(PREINSTALL_FILES) all-am\n\n"; + $output .= "all-am: \$(PREINSTALL_FILES)\n\n"; $output .= "$k =\n"; $output .= "CLEANFILES "; |