diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-06-11 18:23:15 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-06-11 18:23:15 +0000 |
| commit | 35d18ccf396a6cfdcbe5bbdf38df7d01852250bc (patch) | |
| tree | 562e6d161a8957db8a46900b46f661c5e52e1a34 /lib | |
| parent | c5877847749d21bdf84e33929ffa52a56e5c6ca0 (diff) | |
| download | classpath-35d18ccf396a6cfdcbe5bbdf38df7d01852250bc.tar.gz | |
2006-06-11 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics between
2006/05/29 and 2006/06/11.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/.cvsignore | 1 | ||||
| -rw-r--r-- | lib/Makefile.am | 15 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/lib/.cvsignore b/lib/.cvsignore index fb82f0fd0..8ac5f9ba6 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -29,6 +29,7 @@ gen_nio.sh classes.1 resources org +sun META-INF Makefile.deps lists diff --git a/lib/Makefile.am b/lib/Makefile.am index 0d803c95b..20116bb4c 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,16 +177,17 @@ 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 dist-hook: mkdir -p $(distdir) - cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/.. + cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/sun $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/.. # Delete not wanted files. - $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr - $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f - $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f + $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr + $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f + $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f rm -f $(distdir)/../gnu/classpath/Configuration.java rm -f $(distdir)/../gnu/java/locale/LocaleData.java 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 |