* m4/classpath.m4: Renamed --with-classpath* options to

[cacao.git] / src / cacao / Makefile.am

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 12247842ebfcff4202d9081a3d255686b418ec8c..2a5247afd4a716069e0ad0873e79e608858173be 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -23,11 +23,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR)
 
-if ENABLE_THREADS
-THREAD_LIB = \
-       $(top_builddir)/src/threads/libthreads.la
-endif
-
 if ENABLE_STATICVM
 cacao_LDFLAGS = \
        -all-static
@@ -42,7 +37,7 @@ lib_LTLIBRARIES = \
 libjvm_la_LDFLAGS = \
        -version-info 1:0:0
 
-if WITH_CLASSPATH_SUN
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
 libjvm_la_LDFLAGS += \
        -Xlinker --version-script=$(top_srcdir)/contrib/mapfile-vers-product
 endif
@@ -77,11 +72,11 @@ libjvm_la_LIBADD = \
        $(top_builddir)/src/fdlibm/libfdlibm.la \
        $(top_builddir)/src/mm/libmm.la \
        $(top_builddir)/src/native/libnative.la \
+       $(top_builddir)/src/threads/libthreads.la \
        $(top_builddir)/src/toolbox/libtoolbox.la \
        $(top_builddir)/src/vm/libvm.la \
        $(top_builddir)/src/vmcore/libvmcore.la \
-       $(GC_LIB) \
-       $(THREAD_LIB)
+       $(GC_LIB)
 
 bin_PROGRAMS = \
        cacao