* 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 5737f8559c54509b376379d7deb7ec01640c1809..51c3f728ae7c648a6960a8b98bebe9576fa2b945 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -28,30 +28,15 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4690 2006-03-27 11:37:46Z 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) -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
-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
-else
-THREAD_LIB =
+if ENABLE_THREADS
+THREAD_LIB = \
+       $(top_builddir)/src/threads/native/libthreads.la
 endif
 
 if ENABLE_STATICVM
@@ -63,19 +48,24 @@ endif
 
 if ENABLE_LIBJVM
 lib_LTLIBRARIES = \
-       libcacaovm.la
+       libjvm.la
 
-libcacaovm_la_LDFLAGS = \
+libjvm_la_LDFLAGS = \
        -release $(PACKAGE_VERSION)
 
 cacao_LDFLAGS += \
        -export-dynamic
+
+CACAO_LIBS =
 else
 noinst_LTLIBRARIES = \
-       libcacaovm.la
+       libjvm.la
 
 cacao_LDFLAGS += \
        -export-dynamic
+
+CACAO_LIBS = \
+       libjvm.la
 endif
 
 if WITH_STATIC_CLASSPATH
@@ -90,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) \
@@ -104,9 +97,13 @@ CLASSPATH_LIBS = \
 #endif
 endif
 
-libcacaovm_la_SOURCES =
+if ENABLE_RT_TIMING
+cacao_LDFLAGS += -lrt
+endif
+
+libjvm_la_SOURCES =
 
-libcacaovm_la_LIBADD = \
+libjvm_la_LIBADD = \
        $(top_builddir)/src/fdlibm/libfdlibm.la \
        $(top_builddir)/src/mm/libmm.la \
        $(top_builddir)/src/native/libnative.la \
@@ -119,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)