* 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 0161a9c70a0ea7964674379082cbe68cbd7d97d7..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, 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
+## Copyright (C) 1996-2005, 2006, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,17 +19,20 @@
 ## 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 7483 2007-03-08 13:17:40Z michi $
 
-## 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 -I$(top_srcdir)/src/native
 
 LIBS =
 
 SUBDIRS = jit
 
+if ENABLE_ASSERTION
+ASSERTION_SOURCES = \
+       assertion.c \
+       assertion.h
+endif
+
 if ENABLE_CYCLES_STATS
 CYCLES_STATS_SOURCES = \
        cycles-stats.c \
@@ -46,8 +47,11 @@ noinst_LTLIBRARIES = \
        libvm.la
 
 libvm_la_SOURCES = \
+       $(ASSERTION_SOURCES) \
        access.c \
        access.h \
+       array.c \
+       array.h \
        builtin.c \
        builtin.h \
        builtintable.inc \
@@ -59,6 +63,10 @@ libvm_la_SOURCES = \
        initialize.c \
        initialize.h \
        jit_interface.h \
+       package.cpp \
+       package.hpp \
+       primitive.cpp \
+       primitive.hpp \
        properties.c \
        properties.h \
        resolve.c \
@@ -67,8 +75,8 @@ libvm_la_SOURCES = \
        signallocal.h \
        string.c \
        stringlocal.h \
-       vm.c \
-       vm.h
+       vm.cpp \
+       vm.hpp
 
 libvm_la_LIBADD = \
        jit/libjit.la