* src/vm/jit/optimizing/profile.c: Added.

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

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 6cf8b9d85e72f677830605846bae2f18726c9360..51c3f728ae7c648a6960a8b98bebe9576fa2b945 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -28,49 +28,48 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4530 2006-02-21 09:11:53Z twisti $
+## $Id: Makefile.am 5884 2006-10-31 20:11:28Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)
+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
-if NATIVE_THREADS
-GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
-else
-GC_LIB =
-endif
-else
-GC_LIB = $(top_builddir)/src/boehm-gc/libgc.la
+if ENABLE_THREADS
+THREAD_LIB = \
+       $(top_builddir)/src/threads/native/libthreads.la
 endif
 
-if USE_THREADS
-if NATIVE_THREADS
-THREAD_LIB = $(top_builddir)/src/threads/native/libthreads.la
-else
-THREAD_LIB = $(top_builddir)/src/threads/green/libthreads.la
-endif
+if ENABLE_STATICVM
+cacao_LDFLAGS = \
+       -all-static
 else
-THREAD_LIB =
+cacao_LDFLAGS =
 endif
 
-if ENABLE_STATICVM
-noinst_LTLIBRARIES = \
-       libcacaovm.la
+if ENABLE_LIBJVM
+lib_LTLIBRARIES = \
+       libjvm.la
+
+libjvm_la_LDFLAGS = \
+       -release $(PACKAGE_VERSION)
 
+cacao_LDFLAGS += \
+       -export-dynamic
+
+CACAO_LIBS =
 else
-cacao_LDFLAGS = \
-       $(EXPORT_SYMBOLS_FLAGS)
+noinst_LTLIBRARIES = \
+       libjvm.la
 
-lib_LTLIBRARIES = \
-       libcacaovm.la
+cacao_LDFLAGS += \
+       -export-dynamic
 
-libcacaovm_la_LDFLAGS = \
-       -release $(PACKAGE_VERSION)
+CACAO_LIBS = \
+       libjvm.la
 endif
 
 if WITH_STATIC_CLASSPATH
-cacao_LDFLAGS = \
+cacao_LDFLAGS += \
        $(LTLIBICONV)
 
 CLASSPATH_LIBS = \
@@ -81,6 +80,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) \
@@ -95,9 +97,13 @@ CLASSPATH_LIBS = \
 #endif
 endif
 
-libcacaovm_la_SOURCES =
+if ENABLE_RT_TIMING
+cacao_LDFLAGS += -lrt
+endif
 
-libcacaovm_la_LIBADD = \
+libjvm_la_SOURCES =
+
+libjvm_la_LIBADD = \
        $(top_builddir)/src/fdlibm/libfdlibm.la \
        $(top_builddir)/src/mm/libmm.la \
        $(top_builddir)/src/native/libnative.la \
@@ -110,12 +116,10 @@ bin_PROGRAMS = \
        cacao
 
 cacao_SOURCES = \
-       cacao.c \
-       cacao.h
+       cacao.c
 
 cacao_LDADD = \
-       libcacaovm.la \
-       $(CLASSPATH_LIBS)
+       $(CACAO_LIBS)
 
 cacao_DEPENDENCIES = \
        $(cacao_LDADD)