changeset in /hg/icedtea: Find rt files both in the source and b...

[gnu_andrew at member.fsf.org]

changeset cbf3cb70d7c1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cbf3cb70d7c1
description:
	Find rt files both in the source and build directories,
	and handle the case when these are the same with sort -u.

diffstat:

3 files changed, 10 insertions(+), 2 deletions(-)
ChangeLog   |    8 ++++++++
Makefile.am |    2 +-
Makefile.in |    2 +-

diffs (39 lines):

diff -r ca3a8b43a54b -r cbf3cb70d7c1 ChangeLog
--- a/ChangeLog	Tue May 27 21:14:08 2008 +0100
+++ b/ChangeLog	Tue May 27 21:16:59 2008 +0100
@@ -1,3 +1,11 @@ 2008-05-27  Andrew John Hughes  <gnu_and
+2008-05-27  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Do a find for rt files on both the
+	source dir and the build dir, removing
+	duplicates when these are the same.
+	* Makefile.in: Regenerated.
+
 2008-05-27  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* patches/icedtea-override.patch:
diff -r ca3a8b43a54b -r cbf3cb70d7c1 Makefile.am
--- a/Makefile.am	Tue May 27 21:14:08 2008 +0100
+++ b/Makefile.am	Tue May 27 21:16:59 2008 +0100
@@ -875,7 +875,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
 	mkdir -p lib/rt
diff -r ca3a8b43a54b -r cbf3cb70d7c1 Makefile.in
--- a/Makefile.in	Tue May 27 21:14:08 2008 +0100
+++ b/Makefile.in	Tue May 27 21:16:59 2008 +0100
@@ -1314,7 +1314,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
 	mkdir -p lib/rt