* configure.ac,

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

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 8b96e31ee33acd6ff2264894ab03456a1d2f5a2b..85b8cc724d3a5c7b196e673ffb9570b1b43bcc12 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
@@ -24,24 +24,15 @@
 ##
 ## Contact: cacao@cacaojvm.org
 ##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 4970 2006-05-29 14:31:12Z twisti $
+## $Id: Makefile.am 8132 2007-06-22 11:15:47Z 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,14 +49,24 @@ 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
+
+CACAO_LIBS =
 else
 noinst_LTLIBRARIES = \
        libjvm.la
 
 cacao_LDFLAGS += \
        -export-dynamic
+
+CACAO_LIBS = \
+       libjvm.la
 endif
 
 if WITH_STATIC_CLASSPATH
@@ -80,6 +81,9 @@ CLASSPATH_LIBS = \
        $(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) \
@@ -106,6 +110,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)
 
@@ -116,8 +121,7 @@ cacao_SOURCES = \
        cacao.c
 
 cacao_LDADD = \
-       libjvm.la \
-       $(CLASSPATH_LIBS)
+       $(CACAO_LIBS)
 
 cacao_DEPENDENCIES = \
        $(cacao_LDADD)