* 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 91022cce60b1e202622bcbe8a05172988ca722cd..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.
 ##
@@ -21,39 +19,37 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## $Id: Makefile.am 7289 2007-02-06 08:47:05Z 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) -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)/src -I$(top_srcdir)/contrib/vmlog
 
 LIBS =
 
 DIST_SUBDIRS = \
        allocator \
        inline \
+       ir \
        loop \
        optimizing \
        schedule \
-       tools \
        verify \
        \
        intrp \
        alpha \
        arm \
        i386 \
+       m68k \
        mips \
        parisc \
        powerpc \
        powerpc64 \
+       s390 \
        sparc64 \
-       x86_64 \
-       s390
+       x86_64
 
 SUBDIRS = \
+       ir \
        optimizing \
-       tools \
        $(ARCH_DIR)
 
 ARCH_LIB = \
@@ -129,22 +125,20 @@ endif
 
 if WITH_BINUTILS_DISASSEMBLER
 DISASS_SOURCES = disass-common.c
-else
-DISASS_SOURCES =
 endif
 
 noinst_HEADERS = \
        abi.h \
        abi-asm.h \
        asmpart.h \
-       md.h \
-       methodheader.h \
-       patcher.h 
+       methodheader.h
 
 noinst_LTLIBRARIES = \
        libjit.la
 
 libjit_la_SOURCES = \
+       argument.c \
+       argument.h \
        code.c \
        code.h \
        codegen-common.c \
@@ -155,11 +149,21 @@ libjit_la_SOURCES = \
        dseg.h \
        emit-common.c \
        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 \
+       patcher-common.h \
        $(RECOMPILE_SOURCES) \
        $(REG_SOURCES) \
        $(REPLACE_SOURCES) \
@@ -167,7 +171,9 @@ libjit_la_SOURCES = \
        show.h \
        $(STACK_SOURCES) \
        stacktrace.c \
-       stacktrace.h
+       stacktrace.h \
+       trace.c \
+       trace.h
 
 libjit_la_SOURCES += \
        cfg.c \
@@ -175,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) \
@@ -185,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