* src/vm/jit/parse.cpp,

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

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 51956cdc2bf45f1f4518c4f6e0e9bac592842ed8..42bb842472aa8567c9cfe6f2fa9a93639f4f548c 100644 (file)
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -1,9 +1,7 @@
 ## src/vm/jit/Makefile.am
 ##
-## 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
+## Copyright (C) 1996-2005, 2006, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -30,6 +28,7 @@ LIBS =
 DIST_SUBDIRS = \
        allocator \
        inline \
+       ir \
        loop \
        optimizing \
        schedule \
@@ -49,6 +48,7 @@ DIST_SUBDIRS = \
        x86_64
 
 SUBDIRS = \
+       ir \
        optimizing \
        $(ARCH_DIR)
 
@@ -103,16 +103,28 @@ REG_SOURCES = \
        reg.h
 
 REPLACE_SOURCES += \
-       replace.h
+       replace.hpp
 
 STACK_SOURCES = \
        stack.c \
        stack.h
+
+TRAP_SOURCES = \
+       trap.c \
+       trap.h
+endif
+
+if ENABLE_JITCACHE
+JITCACHE_SOURCES = \
+       jitcache.cpp \
+       jitcache.hpp
+
 endif
 
+
 if ENABLE_REPLACEMENT
 REPLACE_SOURCES += \
-       replace.c
+       replace.cpp
 endif
 
 if ENABLE_VERIFIER
@@ -123,6 +135,13 @@ VERIFIER_LIB = \
        verify/libverify.la
 endif
 
+if ENABLE_OPAGENT
+OPAGENT_SOURCES = \
+       oprofile-agent.cpp \
+       oprofile-agent.hpp
+
+endif
+
 if WITH_BINUTILS_DISASSEMBLER
 DISASS_SOURCES = disass-common.c
 endif
@@ -137,39 +156,50 @@ noinst_LTLIBRARIES = \
        libjit.la
 
 libjit_la_SOURCES = \
-       argument.c \
-       argument.h \
-       code.c \
-       code.h \
-       codegen-common.c \
-       codegen-common.h \
+       argument.cpp \
+       argument.hpp \
+       builtin.cpp \
+       builtin.hpp \
+       builtintable.inc \
+       code.cpp \
+       code.hpp \
+       codegen-common.cpp \
+       codegen-common.hpp \
        disass.h \
        $(DISASS_SOURCES) \
        dseg.c \
        dseg.h \
-       emit-common.c \
-       emit-common.h \
+       emit-common.cpp \
+       emit-common.hpp \
        exceptiontable.c \
        exceptiontable.h \
-       icmdtable.inc \
-       jit.c \
-       jit.h \
-       linenumbertable.c \
-       linenumbertable.h \
-       parse.c \
-       parse.h \
-       patcher-common.c \
-       patcher-common.h \
+       executionstate.c \
+       executionstate.h \
+       jit.cpp \
+       jit.hpp \
+       linenumbertable.cpp \
+       linenumbertable.hpp \
+       methodtree.c \
+       methodtree.h \
+       parse.cpp \
+       parse.hpp \
+       patcher-common.cpp \
+       patcher-common.hpp \
        $(RECOMPILE_SOURCES) \
        $(REG_SOURCES) \
+       $(JITCACHE_SOURCES) \
        $(REPLACE_SOURCES) \
-       show.c \
-       show.h \
+       show.cpp \
+       show.hpp \
        $(STACK_SOURCES) \
-       stacktrace.c \
-       stacktrace.h \
-       trace.c \
-       trace.h
+       stacktrace.cpp \
+       stacktrace.hpp \
+       stubs.cpp \
+       stubs.hpp \
+       trace.cpp \
+       trace.hpp \
+       $(TRAP_SOURCES) \
+       $(OPAGENT_SOURCES)
 
 libjit_la_SOURCES += \
        cfg.c \
@@ -177,8 +207,8 @@ libjit_la_SOURCES += \
 
 libjit_la_LIBADD = \
        allocator/liballocator.la \
-       $(ALLOCATOR_LIB) \
        $(INLINE_LIB) \
+       ir/libir.la \
        $(LOOP_LIB) \
        $(OPTIMIZING_LIB) \
        $(PROFILE_LIB) \
@@ -187,6 +217,15 @@ libjit_la_LIBADD = \
        $(INTRP_LIB) \
        $(ARCH_LIB)
 
+if ENABLE_PYTHON
+libjit_la_SOURCES += \
+       python.c
+AM_CPPFLAGS += \
+       @PYTHON_CSPEC@
+LIBS += \
+       @PYTHON_LSPEC@
+endif
+
 
 ## Local variables:
 ## mode: Makefile