* src/vm/jit/parse.c, src/vm/jit/parse.h (Changes): Merged with

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

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index fea7690c38df97b52f39ec973504c1f294bdecc8..7aa719ae35d8aa3329c2eb8468ef7dacb07c4e8b 100644 (file)
--- 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 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,30 +19,43 @@
 ##
 ## 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:
 ##
-## $Id: Makefile.am 3939 2005-12-11 00:02:35Z twisti $
+## $Id: Makefile.am 4809 2006-04-21 21:36:54Z edwin $
 
 ## 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)
+
+LIBS =
 
 SUBDIRS = jit
 
-if STATISTICS
+if ENABLE_STATISTICS
 STATISTICS_OBJ = \
        statistics.c \
        statistics.h
 endif
 
-if USE_ZLIB
+if ENABLE_RT_TIMING
+RT_TIMING_OBJ = \
+       rt-timing.c
+endif
+
+if ENABLE_CYCLES_STATS
+CYCLES_STATS_SOURCE = \
+       cycles-stats.c \
+       cycles-stats.h
+endif
+
+if ENABLE_ZLIB
 ZLIB_OBJ = \
        zip.c \
        zip.h
@@ -52,7 +65,9 @@ noinst_HEADERS = \
        global.h \
        types.h
 
-noinst_LTLIBRARIES = libvmcore.la libvm.la
+noinst_LTLIBRARIES = \
+       libvmcore.la \
+       libvm.la
 
 libvmcore_la_SOURCES = \
        access.c \
@@ -64,6 +79,7 @@ libvmcore_la_SOURCES = \
        class.h \
        classcache.c \
        classcache.h \
+       $(CYCLES_STATS_SOURCE) \
        descriptor.c \
        descriptor.h \
        field.c \
@@ -82,9 +98,13 @@ libvmcore_la_SOURCES = \
        method.h \
        options.c \
        options.h \
+       properties.c \
+       properties.h \
        references.h \
        resolve.c \
        resolve.h \
+       $(RT_TIMING_OBJ) \
+       rt-timing.h \
        $(STATISTICS_OBJ) \
        signal.c \
        signallocal.h \
@@ -98,7 +118,9 @@ libvmcore_la_SOURCES = \
 
 libvm_la_SOURCES = \
        exceptions.c \
-       exceptions.h
+       exceptions.h \
+       vm.c \
+       vm.h
 
 libvm_la_LIBADD = \
        libvmcore.la \