diff options
| author | Mark Wielaard <mark@klomp.org> | 2002-10-06 21:01:57 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2002-10-06 21:01:57 +0000 |
| commit | 1cb5c07a7e3257a2788ba168d299374d5dac429f (patch) | |
| tree | 1706f75004bbc163735db0d2e9f1698b52475129 /lib | |
| parent | be39ba2239876d5b94b2a3507742add69102fcd2 (diff) | |
| download | classpath-1cb5c07a7e3257a2788ba168d299374d5dac429f.tar.gz | |
* configure.in (AC_OUTPUT): Remove com/Makefile, com/sun/Makefile
and com/sun/javadoc/Makefile.
* Makefile.am (SUBDIRS): Remove com.
* lib/Makefile.am (install-data-local): Don't copy com dir.
(glibj.zip): Don't zip com dir.
(maintainer-clean-local): Don't remove com dir.
* gen-classlist.sh.in: Remove com dir from find.
* com/.cvsignore: Removed.
* com/Makefile.am: Removed.
* com/sun/.cvsignore: Removed.
* com/sun/Makefile.am: Removed.
* com/sun/javadoc/.cvsignore: Removed.
* com/sun/javadoc/ClassDoc.java: Removed.
* com/sun/javadoc/ConstructorDoc.java: Removed.
* com/sun/javadoc/Doc.java: Removed.
* com/sun/javadoc/DocErrorReporter.java: Removed.
* com/sun/javadoc/Doclet.java: Removed.
* com/sun/javadoc/ExecutableMemberDoc.java: Removed.
* com/sun/javadoc/FieldDoc.java: Removed.
* com/sun/javadoc/MemberDoc.java: Removed.
* com/sun/javadoc/MethodDoc.java: Removed.
* com/sun/javadoc/PackageDoc.java: Removed.
* com/sun/javadoc/ParamTag.java: Removed.
* com/sun/javadoc/Parameter.java: Removed.
* com/sun/javadoc/ProgramElementDoc.java: Removed.
* com/sun/javadoc/RootDoc.java: Removed.
* com/sun/javadoc/SeeTag.java: Removed.
* com/sun/javadoc/SerialFieldTag.java: Removed.
* com/sun/javadoc/Tag.java: Removed.
* com/sun/javadoc/ThrowsTag.java: Removed.
* com/sun/javadoc/Type.java: Removed.
* com/sun/javadoc/Makefile.am: Removed.
* NEWS: Document javadoc class move.
* vm/reference/Makefile.am (SUBDIRS): Remove gnu.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index a929c678e..b3feef72a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -85,7 +85,6 @@ endif install-data-local : -$(top_srcdir)/mkinstalldirs $(pkgdatadir) - if ! [ -e glibj.zip ]; then cp -R com $(pkgdatadir); fi if ! [ -e glibj.zip ]; then cp -R gnu $(pkgdatadir); fi if ! [ -e glibj.zip ]; then cp -R java $(pkgdatadir); fi if ! [ -e glibj.zip ]; then cp -R javax $(pkgdatadir); fi @@ -95,7 +94,7 @@ glibj.zip: classes compile-classes if ! [ -e gnu/java ]; then mkdir gnu/java; fi if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi cp $(top_srcdir)/gnu/java/locale/*.properties gnu/java/locale/ - if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip com gnu java javax > /dev/null; fi + if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax > /dev/null; fi .PHONY: genclasses @@ -121,7 +120,6 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = classes $(JAVA_DEPEND) maintainer-clean-local: - -rm -rf com -rm -rf gnu -rm -rf java -rm -rf javax diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index 281332e34..43635fee7 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -1,9 +1,9 @@ #! @SH@ # @configure_input@ if test "@top_srcdir@" = "${top_builddir}"; then - @FIND@ @top_srcdir@/com @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 + @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 else - @FIND@ @top_srcdir@/com @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu ${top_builddir}/com ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 + @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 fi for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done |