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

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 43ee54bdf..656f643f2 100644
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -1,9 +1,9 @@
 ## src/vm/jit/Makefile.am
 ##
-## Copyright (C) 1996-2005 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 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
 ##
 ## This file is part of CACAO.
 ##
@@ -19,65 +19,160 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 ##
-## Contact: cacao@complang.tuwien.ac.at
+## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
 ##
-## Changes:
+## Changes: Edwin Steiner
 ##
-## $Id: Makefile.am 2658 2005-06-13 14:14:47Z michi $
+## $Id: Makefile.am 5895 2006-11-03 14:03:40Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -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)
 
-SUBDIRS = loop tools verify @ARCH_DIR@
+LIBS =
 
-DIST_SUBDIRS = inline loop schedule tools verify alpha arm i386 mips powerpc x86_64
+DIST_SUBDIRS = \
+	allocator \
+	inline \
+	loop \
+	optimizing \
+	schedule \
+	tools \
+	verify \
+	\
+	intrp \
+	alpha \
+	i386 \
+	mips \
+	parisc \
+	powerpc \
+	powerpc64 \
+	sparc64 \
+	x86_64
 
-if USE_INLINING
-INLINE_LIB = inline/libinline.la
-SUBDIRS += inline
+SUBDIRS = \
+	optimizing \
+	tools \
+	verify
+
+if ENABLE_JIT
+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
+
+if ENABLE_INLINING
+SUBDIRS += \
+	inline
+
+INLINE_LIB = \
+	inline/libinline.la
+endif
+
+if ENABLE_LOOP
+SUBDIRS += \
+	loop
+
+LOOP_LIB = \
+	loop/libloop.la
 endif
 
 if USE_SCHEDULER
-SCHEDULE_LIB = schedule/libschedule.la
-SUBDIRS += schedule
+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
+DISASS_SOURCES = disass-common.c
+else
+DISASS_SOURCES =
 endif
 
 noinst_HEADERS = \
+	abi.h \
+	abi-asm.h \
 	asmpart.h \
-	codegen.inc \
-	codegen.inc.h \
-	lsra.inc \
-	lsra.h \
-	patcher.h \
-	reg.inc \
-	reg.h
+	methodheader.h \
+	patcher.h 
 
 noinst_LTLIBRARIES = libjit.la
 
 libjit_la_SOURCES = \
-	helper.c \
-	helper.h \
+	code.c \
+	code.h \
+	codegen-common.c \
+	codegen-common.h \
+	disass.h \
+	$(DISASS_SOURCES) \
+	dseg.c \
+	dseg.h \
+	emit-common.c \
+	emit-common.h \
+	icmdtable.inc \
 	jit.c \
 	jit.h \
 	parse.c \
 	parse.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 \
+	$(ALLOCATOR_LIB) \
 	$(INLINE_LIB) \
-	loop/libloop.la \
+	$(LOOP_LIB) \
+	$(OPTIMIZING_LIB) \
+	$(PROFILE_LIB) \
 	$(SCHEDULE_LIB) \
-	verify/libverify.la \
-	@ARCH_DIR@/libarch.la
+	$(INTRP_LIB) \
+	$(ARCH_LIB)
 
 
 ## Local variables: