diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-06-09 21:30:43 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2006-06-09 21:30:43 +0000 |
| commit | 3368e445d5a3eddb30eda6b10712de13f345b5ff (patch) | |
| tree | bb31b10df84e1d03fcc378058b97a42fdf712c84 /lib | |
| parent | a5166318e07c6e592e1bbd6ed278894221da0f2a (diff) | |
| download | classpath-3368e445d5a3eddb30eda6b10712de13f345b5ff.tar.gz | |
* 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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 7 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 4 |
2 files changed, 7 insertions, 4 deletions
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 |