* Merged executionstate branch.

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

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 4e6da4e88583155cc311b201e700580da244f65a..c44f0129e57414a011bf69ab01d8158e4242651b 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)
 
@@ -131,7 +131,6 @@ noinst_HEADERS = \
        abi.h \
        abi-asm.h \
        asmpart.h \
-       md.h \
        methodheader.h
 
 noinst_LTLIBRARIES = \
@@ -152,11 +151,15 @@ libjit_la_SOURCES = \
        emit-common.h \
        exceptiontable.c \
        exceptiontable.h \
+       executionstate.c \
+       executionstate.h \
        icmdtable.inc \
        jit.c \
        jit.h \
        linenumbertable.c \
        linenumbertable.h \
+       methodtree.c \
+       methodtree.h \
        parse.c \
        parse.h \
        patcher-common.c \
@@ -178,8 +181,8 @@ libjit_la_SOURCES += \
 
 libjit_la_LIBADD = \
        allocator/liballocator.la \
-       $(ALLOCATOR_LIB) \
        $(INLINE_LIB) \
+       ir/libir.la \
        $(LOOP_LIB) \
        $(OPTIMIZING_LIB) \
        $(PROFILE_LIB) \
@@ -188,6 +191,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