X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2FMakefile.am;h=656f643f260da4df2df42fe37cc6ccbd1ac83c52;hb=ff4083aaec535fb7a937e3221a42782959586644;hp=f03c2bb3cd609d649f90f72d795f5fff7d3ca273;hpb=3be2d9e1eba15ae55ab5359074a6d89ae06133f5;p=cacao.git

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index f03c2bb3c..656f643f2 100644
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes: Edwin Steiner
 ##
-## $Id: Makefile.am 4773 2006-04-14 11:20:38Z twisti $
+## $Id: Makefile.am 5895 2006-11-03 14:03:40Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -38,10 +38,9 @@ LIBS =
 
 DIST_SUBDIRS = \
 	allocator \
-	ifconv \
 	inline \
 	loop \
-	profile \
+	optimizing \
 	schedule \
 	tools \
 	verify \
@@ -50,47 +49,73 @@ DIST_SUBDIRS = \
 	alpha \
 	i386 \
 	mips \
+	parisc \
 	powerpc \
+	powerpc64 \
+	sparc64 \
 	x86_64
 
 SUBDIRS = \
-	allocator \
+	optimizing \
 	tools \
 	verify
 
 if ENABLE_JIT
-SUBDIRS += $(ARCH_DIR)
-ARCH_LIB = $(ARCH_DIR)/libarch.la
+SUBDIRS += \
+	allocator \
+	$(ARCH_DIR)
+
+ARCH_LIB = \
+	$(ARCH_DIR)/libarch.la
+
+OPTIMIZING_LIB = \
+	optimizing/liboptimizing.la
 endif
 
 if ENABLE_INTRP
-SUBDIRS += intrp
-INTRP_LIB = intrp/libintrp.la
-endif
+SUBDIRS += \
+	intrp
 
-if ENABLE_IFCONV
-SUBDIRS += ifconv
-IFCONV_LIB = ifconv/libifconv.la
+INTRP_LIB = \
+	intrp/libintrp.la
 endif
 
 if ENABLE_INLINING
-SUBDIRS += inline
-INLINE_LIB = inline/libinline.la
+SUBDIRS += \
+	inline
+
+INLINE_LIB = \
+	inline/libinline.la
 endif
 
 if ENABLE_LOOP
-SUBDIRS += loop
-LOOP_LIB = loop/libloop.la
-endif
+SUBDIRS += \
+	loop
 
-if ENABLE_PROFILING
-SUBDIRS += profile
-PROFILE_LIB = profile/libprofile.la
+LOOP_LIB = \
+	loop/libloop.la
 endif
 
 if USE_SCHEDULER
-SUBDIRS += schedule
-SCHEDULE_LIB = schedule/libschedule.la
+SUBDIRS += \
+	schedule
+
+SCHEDULE_LIB = \
+	schedule/libschedule.la
+endif
+
+if ENABLE_JIT
+REG_SOURCES = \
+	reg.c \
+	reg.h
+
+REPLACE_SOURCES = \
+	replace.c \
+	replace.h
+
+STACK_SOURCES = \
+	stack.c \
+	stack.h
 endif
 
 if WITH_BINUTILS_DISASSEMBLER
@@ -103,7 +128,6 @@ noinst_HEADERS = \
 	abi.h \
 	abi-asm.h \
 	asmpart.h \
-	emit.h \
 	methodheader.h \
 	patcher.h 
 
@@ -118,25 +142,33 @@ libjit_la_SOURCES = \
 	$(DISASS_SOURCES) \
 	dseg.c \
 	dseg.h \
+	emit-common.c \
+	emit-common.h \
+	icmdtable.inc \
 	jit.c \
 	jit.h \
 	parse.c \
 	parse.h \
-	reg.c \
-	reg.h \
-	replace.c \
-	replace.h \
-	stack.c \
-	stack.h \
+	$(RECOMPILE_SOURCES) \
+	$(REG_SOURCES) \
+	$(REPLACE_SOURCES) \
+	show.c \
+	show.h \
+	$(STACK_SOURCES) \
 	stacktrace.c \
 	stacktrace.h
 
+libjit_la_SOURCES += \
+	cfg.c \
+	cfg.h
+
 libjit_la_LIBADD = \
 	allocator/liballocator.la \
 	verify/libverify.la \
-	$(IFCONV_LIB) \
+	$(ALLOCATOR_LIB) \
 	$(INLINE_LIB) \
 	$(LOOP_LIB) \
+	$(OPTIMIZING_LIB) \
 	$(PROFILE_LIB) \
 	$(SCHEDULE_LIB) \
 	$(INTRP_LIB) \