diff options
| author | Brian Jones <cbj@gnu.org> | 2003-02-01 05:44:13 +0000 |
|---|---|---|
| committer | Brian Jones <cbj@gnu.org> | 2003-02-01 05:44:13 +0000 |
| commit | 4a8749b95b8920fa625f4365c3f932d0caa89fb6 (patch) | |
| tree | b7f3e4b101270f343fa15066f5b543a13393248a /lib | |
| parent | a286d8e992bbc0a6180638df2bfb55e433642b78 (diff) | |
| download | classpath-4a8749b95b8920fa625f4365c3f932d0caa89fb6.tar.gz | |
* external/README: new file
* external/jaxp: import Classpathx JAXP from January 31, 2003 CVS
* LICENSE: new file
* Makefile.am: distribute LICENSE, external/jaxp/source
* lib/Makefile.am: add external/jaxp/source to classpath; removed
-target 1.1 from jikes invocation
* lib/gen-classlist.sh.in: add external/jaxp/source to directories
to search
* doc/api/Makefile.am: add external/jaxp/source to source path
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 9 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index b134d1f37..7ce44d8c4 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -45,10 +45,10 @@ endif # handling javac definition including programs like jikes here #----------------------------------------------------------------- if FOUND_JIKES -JAVAC = $(JIKES) -target 1.1 +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes +JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes else if FOUND_GCJ -JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes +JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes else if FOUND_KJC JAVAC = $(USER_JABBA) $(ARG_CLASSPATH_VM) $(KJC_CLASSPATH):$(USER_CLASSLIB) $(KJC_MAIN) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes @@ -88,17 +88,19 @@ install-data-local : if ! [ -e glibj.zip ]; then cp -R gnu $(DESTDIR)$(pkgdatadir); fi if ! [ -e glibj.zip ]; then cp -R java $(DESTDIR)$(pkgdatadir); fi if ! [ -e glibj.zip ]; then cp -R javax $(DESTDIR)$(pkgdatadir); fi + if ! [ -e glibj.zip ]; then cp -R org $(DESTDIR)$(pkgdatadir); fi # FIXME - should mimic doc/api/Makefile.am instead... uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir)/gnu rm -rf $(DESTDIR)$(pkgdatadir)/java rm -rf $(DESTDIR)$(pkgdatadir)/javax + rm -rf $(DESTDIR)$(pkgdatadir)/org .PHONY: genclasses glibj.zip: classes compile-classes resources - if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax > /dev/null; fi + if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org > /dev/null; fi resources: if ! [ -e gnu ]; then mkdir gnu; fi @@ -131,3 +133,4 @@ maintainer-clean-local: -rm -rf gnu -rm -rf java -rm -rf javax + -rm -rf org diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index 43635fee7..fef1c9416 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@/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_srcdir@/external/jaxp/source ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 else - @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 + @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/source ${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 |