X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2FMakefile.am;h=4e6da4e88583155cc311b201e700580da244f65a;hb=58ab1dce47411e7113ace0e4ed6522c28977bc42;hp=0c29ff8dc9b0156b82c580682797fb4fa587f10e;hpb=fd78c93502cfc17e009642aea9ae33368a9132df;p=cacao.git

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 0c29ff8dc..4e6da4e88 100644
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -1,6 +1,6 @@
 ## src/vm/jit/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+## 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
@@ -21,18 +21,9 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes: Edwin Steiner
-##
-## $Id: Makefile.am 5890 2006-10-31 22:02:30Z 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)
+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 =
 
@@ -42,31 +33,32 @@ DIST_SUBDIRS = \
 	loop \
 	optimizing \
 	schedule \
-	tools \
 	verify \
 	\
 	intrp \
 	alpha \
+	arm \
 	i386 \
+	m68k \
 	mips \
+	parisc \
 	powerpc \
 	powerpc64 \
+	s390 \
 	sparc64 \
 	x86_64
 
 SUBDIRS = \
 	optimizing \
-	tools \
-	verify
-
-if ENABLE_JIT
-SUBDIRS += \
-	allocator \
 	$(ARCH_DIR)
 
 ARCH_LIB = \
 	$(ARCH_DIR)/libarch.la
 
+if ENABLE_JIT
+SUBDIRS += \
+	allocator
+
 OPTIMIZING_LIB = \
 	optimizing/liboptimizing.la
 endif
@@ -103,13 +95,14 @@ SCHEDULE_LIB = \
 	schedule/libschedule.la
 endif
 
+REPLACE_SOURCES =
+
 if ENABLE_JIT
 REG_SOURCES = \
 	reg.c \
 	reg.h
 
-REPLACE_SOURCES = \
-	replace.c \
+REPLACE_SOURCES += \
 	replace.h
 
 STACK_SOURCES = \
@@ -117,22 +110,36 @@ STACK_SOURCES = \
 	stack.h
 endif
 
+if ENABLE_REPLACEMENT
+REPLACE_SOURCES += \
+	replace.c
+endif
+
+if ENABLE_VERIFIER
+SUBDIRS += \
+	verify
+
+VERIFIER_LIB = \
+	verify/libverify.la
+endif
+
 if WITH_BINUTILS_DISASSEMBLER
 DISASS_SOURCES = disass-common.c
-else
-DISASS_SOURCES =
 endif
 
 noinst_HEADERS = \
 	abi.h \
 	abi-asm.h \
 	asmpart.h \
-	methodheader.h \
-	patcher.h 
+	md.h \
+	methodheader.h
 
-noinst_LTLIBRARIES = libjit.la
+noinst_LTLIBRARIES = \
+	libjit.la
 
 libjit_la_SOURCES = \
+	argument.c \
+	argument.h \
 	code.c \
 	code.h \
 	codegen-common.c \
@@ -143,11 +150,17 @@ libjit_la_SOURCES = \
 	dseg.h \
 	emit-common.c \
 	emit-common.h \
+	exceptiontable.c \
+	exceptiontable.h \
 	icmdtable.inc \
 	jit.c \
 	jit.h \
+	linenumbertable.c \
+	linenumbertable.h \
 	parse.c \
 	parse.h \
+	patcher-common.c \
+	patcher-common.h \
 	$(RECOMPILE_SOURCES) \
 	$(REG_SOURCES) \
 	$(REPLACE_SOURCES) \
@@ -155,7 +168,9 @@ libjit_la_SOURCES = \
 	show.h \
 	$(STACK_SOURCES) \
 	stacktrace.c \
-	stacktrace.h
+	stacktrace.h \
+	trace.c \
+	trace.h
 
 libjit_la_SOURCES += \
 	cfg.c \
@@ -163,13 +178,13 @@ libjit_la_SOURCES += \
 
 libjit_la_LIBADD = \
 	allocator/liballocator.la \
-	verify/libverify.la \
 	$(ALLOCATOR_LIB) \
 	$(INLINE_LIB) \
 	$(LOOP_LIB) \
 	$(OPTIMIZING_LIB) \
 	$(PROFILE_LIB) \
 	$(SCHEDULE_LIB) \
+	$(VERIFIER_LIB) \
 	$(INTRP_LIB) \
 	$(ARCH_LIB)