diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-05-26 08:46:58 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2004-05-26 08:46:58 +0000 |
| commit | 517a3b7baf9e34f6e3777c0c5045c0871bf2a251 (patch) | |
| tree | a89d90b63104581eee57371439fef519dbb469f1 /lib | |
| parent | 499dba7355463bfe63b225c30895b48daafafa04 (diff) | |
| download | classpath-517a3b7baf9e34f6e3777c0c5045c0871bf2a251.tar.gz | |
2004-05-26 Michael Koch <konqueror@gmx.de>
* acinclude.m4
(CLASSPATH_CHECK_KAFFE): Removed.
(CLASSPATH_WITH_KAFFE): Removed.
(CLASSPATH_CHECK_JAVA): Removed.
(CLASSPAHT_WITH_JAVA): Removed.
(CLASSPAHT_FIND_JAVA): Removed.
(CLASSPATH_CHECK_KJC): Rewritten to check for kjc script.
(CLASSPATH_WITH_KJC): New macro.
* configure.ac: Dont call CLASSPAHT_FIND_JAVA.
* lib/Makefile.am
(KJC_CLASSPATH): Removed.
(KJC_MAIN): Removed.
(JAVAC): Set correctly when using kjc.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 09dc2af1b..c821fb7d5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,8 +5,6 @@ JAVA_DEPEND = java.dep ## this file and restart the make process again sinclude $(JAVA_DEPEND) -KJC_CLASSPATH=@KJC_CLASSPATH@ - USER_CLASSLIB = @USER_CLASSLIB@ GCJ = @GCJ@ @@ -18,12 +16,7 @@ propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -type d ! propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -name \*\.properties) #----------------------------------------------------------------- -# defining a javac program written in java -#----------------------------------------------------------------- -KJC_MAIN = at.dms.kjc.Main - -#----------------------------------------------------------------- -# defining how to designate classpath for a vm and a javac type +# defining how to designate classpath for a vm and a javac type # program #----------------------------------------------------------------- ARG_CLASSPATH_VM = -classpath @@ -44,7 +37,7 @@ if FOUND_GCJ 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 +JAVAC = $(KJC) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes endif # FOUND_KJC endif # FOUND_GCJ endif # FOUND_JIKES |