* src/vm/vm.c, src/vm/vm.h: Moved to .cpp.

[cacao.git] / src / vm / Makefile.am

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index 255eebc1612050617c753ee1db338466e14be2f4..495a67d4c9bc3c7c61203814bbc385d50474d584 100644 (file)
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -1,9 +1,7 @@
 ## src/vm/Makefile.am
 ##
-## 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
+## Copyright (C) 1996-2005, 2006, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,89 +19,66 @@
 ## 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:
-##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z 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) -I$(top_builddir)/src -I$(top_srcdir)/contrib/vmlog -I$(top_srcdir)/src/native
+
+LIBS =
 
 SUBDIRS = jit
 
-if ENABLE_STATISTICS
-STATISTICS_OBJ = \
-       statistics.c \
-       statistics.h
+if ENABLE_ASSERTION
+ASSERTION_SOURCES = \
+       assertion.c \
+       assertion.h
 endif
 
-if ENABLE_ZLIB
-ZLIB_OBJ = \
-       zip.c \
-       zip.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 = \
+       $(ASSERTION_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 \
-       hashtable.c \
-       hashtable.h \
        initialize.c \
        initialize.h \
-       linker.c \
-       linker.h \
-       loader.c \
-       loader.h \
-       method.c \
-       method.h \
-       options.c \
-       options.h \
+       jit_interface.h \
+       package.cpp \
+       package.hpp \
+       primitive.cpp \
+       primitive.hpp \
        properties.c \
        properties.h \
-       references.h \
        resolve.c \
        resolve.h \
-       $(STATISTICS_OBJ) \
        signal.c \
        signallocal.h \
        string.c \
        stringlocal.h \
-       suck.c \
-       suck.h \
-       utf8.c \
-       utf8.h \
-       $(ZLIB_OBJ)
-
-libvm_la_SOURCES = \
-       exceptions.c \
-       exceptions.h
+       vm.cpp \
+       vm.hpp
 
 libvm_la_LIBADD = \
-       libvmcore.la \
        jit/libjit.la