* Removed all Id tags.

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

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index 7aa719ae35d8aa3329c2eb8468ef7dacb07c4e8b..34cdc2a2cceb332bcb0fbead6721eb69d5d193d8 100644 (file)
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -1,6 +1,6 @@
 ## src/vm/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+## 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
@@ -21,109 +21,58 @@
 ## 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 4809 2006-04-21 21:36:54Z edwin $
 
 ## 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)
+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
-endif
-
-if ENABLE_RT_TIMING
-RT_TIMING_OBJ = \
-       rt-timing.c
-endif
-
 if ENABLE_CYCLES_STATS
-CYCLES_STATS_SOURCE = \
+CYCLES_STATS_SOURCES = \
        cycles-stats.c \
        cycles-stats.h
 endif
 
-if ENABLE_ZLIB
-ZLIB_OBJ = \
-       zip.c \
-       zip.h
-endif
-
 noinst_HEADERS = \
        global.h \
        types.h
 
 noinst_LTLIBRARIES = \
-       libvmcore.la \
        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 \
-       $(CYCLES_STATS_SOURCE) \
-       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 \
+       primitive.c \
+       primitive.h \
        properties.c \
        properties.h \
-       references.h \
        resolve.c \
        resolve.h \
-       $(RT_TIMING_OBJ) \
-       rt-timing.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.c \
        vm.h
 
 libvm_la_LIBADD = \
-       libvmcore.la \
        jit/libjit.la