* src/vm/jit/verify/generate.pl: Further changes for the type inferer.

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

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index 7585b2234c383e62f35f51753c8d6a61ae0ccdd7..9c6da3a59246899f6df1cfbc2ec0770feb30ba49 100644 (file)
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -26,22 +26,43 @@
 ##
 ## Authors: Christian Thalinger
 ##
-## Changes:
-##
-## $Id: Makefile.am 4530 2006-02-21 09:11:53Z twisti $
+## $Id: Makefile.am 6216 2006-12-18 18:21:37Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_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)
+
+LIBS =
 
 SUBDIRS = jit
 
+if ENABLE_JAVASE
+ANNOTATION_SOURCES = \
+       annotation.c \
+       annotation.h
+
+STACKMAP_SOURCES = \
+       stackmap.c \
+       stackmap.h
+endif
+
 if ENABLE_STATISTICS
-STATISTICS_OBJ = \
+STATISTICS_SOURCES = \
        statistics.c \
        statistics.h
 endif
 
+if ENABLE_RT_TIMING
+RT_TIMING_OBJ = \
+       rt-timing.c
+endif
+
+if ENABLE_CYCLES_STATS
+CYCLES_STATS_SOURCE = \
+       cycles-stats.c \
+       cycles-stats.h
+endif
+
 if ENABLE_ZLIB
 ZLIB_OBJ = \
        zip.c \
@@ -52,11 +73,14 @@ noinst_HEADERS = \
        global.h \
        types.h
 
-noinst_LTLIBRARIES = libvmcore.la libvm.la
+noinst_LTLIBRARIES = \
+       libvmcore.la \
+       libvm.la
 
 libvmcore_la_SOURCES = \
        access.c \
        access.h \
+       $(ANNOTATION_SOURCES) \
        builtin.c \
        builtin.h \
        builtintable.inc \
@@ -64,6 +88,7 @@ libvmcore_la_SOURCES = \
        class.h \
        classcache.c \
        classcache.h \
+       $(CYCLES_STATS_SOURCE) \
        descriptor.c \
        descriptor.h \
        field.c \
@@ -87,9 +112,12 @@ libvmcore_la_SOURCES = \
        references.h \
        resolve.c \
        resolve.h \
-       $(STATISTICS_OBJ) \
+       $(RT_TIMING_OBJ) \
+       rt-timing.h \
+       $(STATISTICS_SOURCES) \
        signal.c \
        signallocal.h \
+       $(STACKMAP_SOURCES) \
        string.c \
        stringlocal.h \
        suck.c \