X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2FMakefile.am;h=19969f35e300909b58587d91c2ee4e7ca42e3303;hb=94c43bfe30c03dbaab1a28a1c1b8cfd4b9fc5a32;hp=9497ca9eafc6eb942fb3cc04239e0ebfac7b8e76;hpb=5927b7eff4a723b052f2c01cb4463af94ce7cb88;p=cacao.git

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 9497ca9ea..19969f35e 100644
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -21,22 +21,19 @@
 ## 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 7725 2007-04-16 21:09:39Z 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 \
@@ -53,8 +50,8 @@ DIST_SUBDIRS = \
 	x86_64
 
 SUBDIRS = \
+	ir \
 	optimizing \
-	tools \
 	$(ARCH_DIR)
 
 ARCH_LIB = \
@@ -136,14 +133,14 @@ 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 \
@@ -154,11 +151,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) \
@@ -166,7 +169,9 @@ libjit_la_SOURCES = \
 	show.h \
 	$(STACK_SOURCES) \
 	stacktrace.c \
-	stacktrace.h
+	stacktrace.h \
+	trace.c \
+	trace.h
 
 libjit_la_SOURCES += \
 	cfg.c \
@@ -174,8 +179,8 @@ libjit_la_SOURCES += \
 
 libjit_la_LIBADD = \
 	allocator/liballocator.la \
-	$(ALLOCATOR_LIB) \
 	$(INLINE_LIB) \
+	ir/libir.la \
 	$(LOOP_LIB) \
 	$(OPTIMIZING_LIB) \
 	$(PROFILE_LIB) \
@@ -184,6 +189,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