* configure.ac (static-classpath): Removed.

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

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index a35d863b3367cc220165025b827c70a13457fffa..16529cdceba3c2d99abd757a7e83f6adb2e9be1b 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -1,6 +1,6 @@
 ## src/cacao/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+## Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
 ## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
 ## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
 ## J. Wenninger, Institut f. Computersprachen - TU Wien
@@ -23,25 +23,14 @@
 ## 02110-1301, USA.
 ##
 ## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 5579 2006-09-29 11:37:12Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 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 DISABLE_GC
-GC_LIB =
-else
-GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
-endif
-
 if ENABLE_THREADS
-THREAD_LIB = $(top_builddir)/src/threads/native/libthreads.la
+THREAD_LIB = \
+       $(top_builddir)/src/threads/libthreads.la
 endif
 
 if ENABLE_STATICVM
@@ -58,6 +47,11 @@ lib_LTLIBRARIES = \
 libjvm_la_LDFLAGS = \
        -release $(PACKAGE_VERSION)
 
+if WITH_CLASSPATH_SUN
+libjvm_la_LDFLAGS += \
+       -Xlinker --version-script=$(top_srcdir)/contrib/mapfile-vers-product
+endif
+
 cacao_LDFLAGS += \
        -export-dynamic
 
@@ -73,35 +67,6 @@ CACAO_LIBS = \
        libjvm.la
 endif
 
-if WITH_STATIC_CLASSPATH
-cacao_LDFLAGS += \
-       $(LTLIBICONV)
-
-CLASSPATH_LIBS = \
-       $(CLASSPATH_LIBDIR)/classpath/libjavaio.a \
-       $(CLASSPATH_LIBDIR)/classpath/libjavanio.a \
-       $(CLASSPATH_LIBDIR)/classpath/libjavanet.a \
-       $(CLASSPATH_LIBDIR)/classpath/libjavautil.a \
-       $(CLASSPATH_LIBDIR)/classpath/libjavalang.a \
-       $(CLASSPATH_LIBDIR)/classpath/libjavalangreflect.a
-
-CACAO_LIBS += \
-       $(CLASSPATH_LIBS)
-
-#if USE_GTK_PEER
-#cacao_CFLAGS = \
-#      $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(PANGOFT2_CFLAGS) \
-#      $(XML_CFLAGS) $(XSLT_CFLAGS)
-#
-#cacao_LDFLAGS += \
-#      $(GTK_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) $(X_LIBS) -lXtst \
-#      $(XML_LIBS) $(XSLT_LIBS)
-#
-#CLASSPATH_LIBS += \
-#      $(CLASSPATH_LIBDIR)/classpath/libgtkpeer.a
-#endif
-endif
-
 if ENABLE_RT_TIMING
 cacao_LDFLAGS += -lrt
 endif
@@ -114,6 +79,7 @@ libjvm_la_LIBADD = \
        $(top_builddir)/src/native/libnative.la \
        $(top_builddir)/src/toolbox/libtoolbox.la \
        $(top_builddir)/src/vm/libvm.la \
+       $(top_builddir)/src/vmcore/libvmcore.la \
        $(GC_LIB) \
        $(THREAD_LIB)