X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2FMakefile.am;h=bc1ad834b2f607b7da77c33887e43fcdd1f822ca;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=13974da4a0521764f1eaa4f8637f06e43658be8e;hpb=6925ab26d61a2ab00c278b49fb3100a31ef75e42;p=cacao.git

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 13974da4a..bc1ad834b 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,53 +21,44 @@
 ## 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 5884 2006-10-31 20:11:28Z 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 =
 
 DIST_SUBDIRS = \
 	allocator \
-	ifconv \
 	inline \
 	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
@@ -80,14 +71,6 @@ INTRP_LIB = \
 	intrp/libintrp.la
 endif
 
-if ENABLE_IFCONV
-SUBDIRS += \
-	ifconv
-
-IFCONV_LIB = \
-	ifconv/libifconv.la
-endif
-
 if ENABLE_INLINING
 SUBDIRS += \
 	inline
@@ -112,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 = \
@@ -126,20 +110,33 @@ 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 \
+	md.h \
 	methodheader.h \
 	patcher.h 
 
-noinst_LTLIBRARIES = libjit.la
+noinst_LTLIBRARIES = \
+	libjit.la
 
 libjit_la_SOURCES = \
 	code.c \
@@ -157,6 +154,8 @@ libjit_la_SOURCES = \
 	jit.h \
 	parse.c \
 	parse.h \
+	patcher-common.c \
+	patcher-common.h \
 	$(RECOMPILE_SOURCES) \
 	$(REG_SOURCES) \
 	$(REPLACE_SOURCES) \
@@ -164,24 +163,23 @@ libjit_la_SOURCES = \
 	show.h \
 	$(STACK_SOURCES) \
 	stacktrace.c \
-	stacktrace.h
+	stacktrace.h \
+	trace.c \
+	trace.h
 
 libjit_la_SOURCES += \
 	cfg.c \
-	cfg.h \
-	reorder.c \
-	reorder.h
+	cfg.h
 
 libjit_la_LIBADD = \
 	allocator/liballocator.la \
-	verify/libverify.la \
 	$(ALLOCATOR_LIB) \
-	$(IFCONV_LIB) \
 	$(INLINE_LIB) \
 	$(LOOP_LIB) \
 	$(OPTIMIZING_LIB) \
 	$(PROFILE_LIB) \
 	$(SCHEDULE_LIB) \
+	$(VERIFIER_LIB) \
 	$(INTRP_LIB) \
 	$(ARCH_LIB)