X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2FMakefile.am;h=34cdc2a2cceb332bcb0fbead6721eb69d5d193d8;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=e497080c6c62ed1af2b52e66aec4a029f4f27620;hpb=765e46d02e924d6311207e99ad8896ccf31d8231;p=cacao.git

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index e497080c6..34cdc2a2c 100644
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -1,9 +1,9 @@
 ## src/vm/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, 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
 ##
 ## This file is part of CACAO.
 ##
@@ -19,87 +19,60 @@
 ##
 ## 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.
-##
-## Contact: cacao@complang.tuwien.ac.at
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 3544 2005-11-03 20:35:18Z twisti $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 
 ## 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) -I$(top_builddir)/src -I$(top_srcdir)/contrib/vmlog -I$(top_srcdir)/src/native
 
-SUBDIRS = jit
+LIBS =
 
-if STATISTICS
-STATISTICS_OBJ = \
-	statistics.c \
-	statistics.h
-endif
+SUBDIRS = jit
 
-if USE_ZLIB
-ZLIB_OBJ = \
-	unzip.c \
-	unzip.h
+if ENABLE_CYCLES_STATS
+CYCLES_STATS_SOURCES = \
+	cycles-stats.c \
+	cycles-stats.h
 endif
 
 noinst_HEADERS = \
 	global.h \
 	types.h
 
-noinst_LTLIBRARIES = libvmcore.la libvm.la
+noinst_LTLIBRARIES = \
+	libvm.la
 
-libvmcore_la_SOURCES = \
+libvm_la_SOURCES = \
 	access.c \
 	access.h \
+	array.c \
+	array.h \
 	builtin.c \
 	builtin.h \
 	builtintable.inc \
-	class.c \
-	class.h \
-	classcache.c \
-	classcache.h \
-	descriptor.c \
-	descriptor.h \
-	field.c \
-	field.h \
+	$(CYCLES_STATS_SOURCES) \
+	exceptions.c \
+	exceptions.h \
 	finalizer.c \
 	finalizer.h \
 	initialize.c \
 	initialize.h \
-	linker.c \
-	linker.h \
-	loader.c \
-	loader.h \
-	method.c \
-	method.h \
-	options.c \
-	options.h \
-	references.h \
+	jit_interface.h \
+	primitive.c \
+	primitive.h \
+	properties.c \
+	properties.h \
 	resolve.c \
 	resolve.h \
-	$(STATISTICS_OBJ) \
 	signal.c \
 	signallocal.h \
 	string.c \
 	stringlocal.h \
-	tables.c \
-	tables.h \
-	utf8.c \
-	utf8.h \
-	$(ZLIB_OBJ)
-
-libvm_la_SOURCES = \
-	exceptions.c \
-	exceptions.h
+	vm.c \
+	vm.h
 
 libvm_la_LIBADD = \
-	libvmcore.la \
 	jit/libjit.la