From 3368e445d5a3eddb30eda6b10712de13f345b5ff Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 9 Jun 2006 21:30:43 +0000
Subject: 	* lib/Makefile.am (install-data-local): Copy 'sun' files. 
 (uninstall-local): Delete 'sun' directory. 	(glibj.zip): Include 'sun'
 classes. 	(clean-local): Delete 'sun' directory. 	*
 lib/gen-classlist.sh.in: Search 'sun' subdirectories.

---
 ChangeLog               | 8 ++++++++
 lib/Makefile.am         | 7 +++++--
 lib/gen-classlist.sh.in | 4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d1f78db6d..fe28c52a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-09  Tom Tromey  <tromey@redhat.com>
+
+	* lib/Makefile.am (install-data-local): Copy 'sun' files.
+	(uninstall-local): Delete 'sun' directory.
+	(glibj.zip): Include 'sun' classes.
+	(clean-local): Delete 'sun' directory.
+	* lib/gen-classlist.sh.in: Search 'sun' subdirectories.
+
 2006-06-09  Roman Kennke  <kennke@aicas.com>
 
 	* gnu/java/awt/java2d/AbstractGraphics2D.java
diff --git a/lib/Makefile.am b/lib/Makefile.am
index db826d637..8daa96a16 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -73,6 +73,7 @@ install-data-local: genclasses compile-classes
 	cp -R java $(DESTDIR)$(pkgdatadir)
 	cp -R javax $(DESTDIR)$(pkgdatadir)
 	cp -R org $(DESTDIR)$(pkgdatadir)
+	cp -R sun $(DESTDIR)$(pkgdatadir)
 	cp -R META-INF $(DESTDIR)$(pkgdatadir)
 
 # FIXME - should mimic doc/api/Makefile.am instead...
@@ -81,6 +82,7 @@ uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir)/java
 	rm -rf $(DESTDIR)$(pkgdatadir)/javax
 	rm -rf $(DESTDIR)$(pkgdatadir)/org
+	rm -rf $(DESTDIR)$(pkgdatadir)/sun
 	rm -rf $(DESTDIR)$(pkgdatadir)/META-INF
 
 endif # INSTALL_CLASS_FILES
@@ -95,8 +97,8 @@ glibj.zip:
 else
 
 glibj.zip: classes compile-classes resources
-	if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi
-	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org META-INF; fi
+	if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null; fi
+	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org sun META-INF; fi
 
 endif # USE_PREBUILT_GLIBJ_ZIP
 
@@ -175,6 +177,7 @@ clean-local:
 	-rm -rf javax
 	-rm -rf org
 	-rm -rf com
+	-rm -rf sun
 	-rm -rf META-INF
 	-rm -rf lists
 	-rm -f Makefile.deps
diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in
index 5f7055ffd..ff76a22ea 100755
--- a/lib/gen-classlist.sh.in
+++ b/lib/gen-classlist.sh.in
@@ -18,7 +18,7 @@ echo "Adding java source files from srcdir '@top_srcdir@'."
 # We do this because it makes splitting for the gcj build much
 # cheaper.
 (cd @top_srcdir@
- @FIND@ java javax gnu org -follow -name '*.java' -print |
+ @FIND@ java javax gnu org sun -follow -name '*.java' -print |
  sort -r | sed -e 's,/\([^/]*\)$, \1,' |
  while read pkg file; do
     echo $pkg @top_srcdir@ $pkg/$file
@@ -43,7 +43,7 @@ vm_dirlist=`echo "@vm_classes@" | sed -e 's/:/ /g'`
 echo "Adding java source files from VM directory $vm_dirlist"
 for dir in $vm_dirlist; do
    (cd $dir
-   for subdir in java javax gnu org com; do
+   for subdir in java javax gnu org com sun; do
       if test -d $subdir; then
 	 @FIND@ $subdir -name '*.java' -print
       fi
-- 
cgit v1.2.1