X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2FMakefile.am;h=4570ed8d221e4969bb4856369bf760e7c9f06859;hb=eb0ddb3dff98e2ceff719f965cd09f895c523490;hp=bd8275b91f003ad23ae2aaf65d54e6ff210e439a;hpb=66ddc64ad81adbde39a82fca7adee578555a90ed;p=cacao.git

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index bd8275b91..4570ed8d2 100644
--- 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,10 +19,7 @@
 ## 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 8145 2007-06-27 08:54:10Z michi $
 
-## 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 -I$(top_srcdir)/contrib/vmlog
 
@@ -33,10 +28,10 @@ LIBS =
 DIST_SUBDIRS = \
 	allocator \
 	inline \
+	ir \
 	loop \
 	optimizing \
 	schedule \
-	tools \
 	verify \
 	\
 	intrp \
@@ -53,8 +48,8 @@ DIST_SUBDIRS = \
 	x86_64
 
 SUBDIRS = \
+	ir \
 	optimizing \
-	tools \
 	$(ARCH_DIR)
 
 ARCH_LIB = \
@@ -108,16 +103,20 @@ REG_SOURCES = \
 	reg.h
 
 REPLACE_SOURCES += \
-	replace.h
+	replace.hpp
 
 STACK_SOURCES = \
 	stack.c \
 	stack.h
+
+TRAP_SOURCES = \
+	trap.cpp \
+	trap.hpp
 endif
 
 if ENABLE_REPLACEMENT
 REPLACE_SOURCES += \
-	replace.c
+	replace.cpp
 endif
 
 if ENABLE_VERIFIER
@@ -128,6 +127,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
@@ -136,39 +142,55 @@ noinst_HEADERS = \
 	abi.h \
 	abi-asm.h \
 	asmpart.h \
-	md.h \
-	methodheader.h \
-	patcher.h 
+	methodheader.h
 
 noinst_LTLIBRARIES = \
 	libjit.la
 
 libjit_la_SOURCES = \
-	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 \
-	icmdtable.inc \
-	jit.c \
-	jit.h \
-	parse.c \
-	parse.h \
-	patcher-common.c \
-	patcher-common.h \
+	emit-common.cpp \
+	emit-common.hpp \
+	exceptiontable.c \
+	exceptiontable.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) \
 	$(REPLACE_SOURCES) \
-	show.c \
-	show.h \
+	show.cpp \
+	show.hpp \
 	$(STACK_SOURCES) \
-	stacktrace.c \
-	stacktrace.h
+	stacktrace.cpp \
+	stacktrace.hpp \
+	stubs.cpp \
+	stubs.hpp \
+	trace.cpp \
+	trace.hpp \
+	$(TRAP_SOURCES) \
+	$(OPAGENT_SOURCES)
 
 libjit_la_SOURCES += \
 	cfg.c \
@@ -176,8 +198,8 @@ libjit_la_SOURCES += \
 
 libjit_la_LIBADD = \
 	allocator/liballocator.la \
-	$(ALLOCATOR_LIB) \
 	$(INLINE_LIB) \
+	ir/libir.la \
 	$(LOOP_LIB) \
 	$(OPTIMIZING_LIB) \
 	$(PROFILE_LIB) \
@@ -186,6 +208,16 @@ libjit_la_LIBADD = \
 	$(INTRP_LIB) \
 	$(ARCH_LIB)
 
+if ENABLE_PYTHON
+libjit_la_SOURCES += \
+	python.c \
+	python.h
+AM_CPPFLAGS += \
+	@PYTHON_CSPEC@
+LIBS += \
+	@PYTHON_LSPEC@
+endif
+
 
 ## Local variables:
 ## mode: Makefile