diff options
| author | Mark Wielaard <mark@klomp.org> | 2004-10-09 16:38:55 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2004-10-09 16:38:55 +0000 |
| commit | 5623894d68d1f81928d4bd673c6d775b14f7be79 (patch) | |
| tree | 06c80256a84e564cd424428acaf19addf3376b3d /lib | |
| parent | f9a250e3ee4a01b7cae4bcff886d239e93684b29 (diff) | |
| download | classpath-5623894d68d1f81928d4bd673c6d775b14f7be79.tar.gz | |
* configure.ac: Don't create a link to the VM specific files.
* include/Makefile.am: Remove vm/current with topsrc_dir vm/reference.
* lib/Makefile.am: Likewise.
* lib/gen-classlist.sh.in: Likewise.
* lib/mkdep.pl.in: Likewise.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 4 | ||||
| -rwxr-xr-x | lib/mkdep.pl.in | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 3d9df3910..e9ef6333b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -18,10 +18,10 @@ propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -nam # handling source to bytecode compiler programs like gcj, jikes and kjc if FOUND_GCJ -JAVAC = $(GCJ) --bootclasspath '' --classpath $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes +JAVAC = $(GCJ) --bootclasspath '' --classpath $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -C -d . @classes else if FOUND_JIKES -JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes +JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -d . @classes else if FOUND_KJC JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index 3b8cb89bf..82b39eee0 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_srcdir@/org ${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@/org @top_srcdir@/vm/reference -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 else - @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org ${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@/org ${top_builddir}/gnu @top_srcdir@/vm/reference -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 diff --git a/lib/mkdep.pl.in b/lib/mkdep.pl.in index c5a9c1fa7..b30fd7ae9 100755 --- a/lib/mkdep.pl.in +++ b/lib/mkdep.pl.in @@ -84,7 +84,7 @@ sub writeNativeFile $j = $natives[$i]; $j =~ s/^$top_srcdir_regex//; # remove ../ or similar $j =~ s/^(\.\.\/)+//g; # remove all preceding ../ - $j =~ s/^vm\/current\///; # remove vm/current/ + $j =~ s/^vm\/reference\///; # remove vm/reference/ $j =~ s/\//_/g; # replace / with _ $j =~ s/\.java$/\.h/; # replace .java with .h print MAKEDEP " \$(top_builddir)/include/", $j, " \\", "\n"; @@ -92,7 +92,7 @@ sub writeNativeFile $j = $natives[$#natives]; $j =~ s/^$top_srcdir_regex//; # remove ../ $j =~ s/^(\.\.\/)+//g; # remove all preceding ../ - $j =~ s/^vm\/current\///; # remove vm/current/ + $j =~ s/^vm\/reference\///; # remove vm/reference/ $j =~ s/\//_/g; # replace / with _ $j =~ s/\.java/\.h/; # replace .java with .h print MAKEDEP " \$(top_builddir)/include/", $j, "\n\n"; @@ -112,7 +112,7 @@ sub writeNativeFile $j = $natives[$i]; $j =~ s/^$top_srcdir_regex//; # remove ../ $j =~ s/^(\.\.\/)+//g; # remove all preceding ../ - $j =~ s/^vm\/current\///; # remove vm/current/ + $j =~ s/^vm\/reference\///; # remove vm/reference/ # $k = $l = $j; $l = $j; $j =~ s/\//_/g; # replace / with _ @@ -131,7 +131,7 @@ sub writeNativeFile $j = $natives[$#natives]; $j =~ s/^$top_srcdir_regex//; # remove ../ $j =~ s/^(\.\.\/)+//g; # remove all preceding ../ - $j =~ s/^vm\/current\///; # remove vm/current/ + $j =~ s/^vm\/reference\///; # remove vm/reference/ # $k = $l = $j; $l = $j; $j =~ s/\//_/g; # replace / with _ |