X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2FMakefile.am;h=7aa719ae35d8aa3329c2eb8468ef7dacb07c4e8b;hb=4f7f3896b97b7c228687fc2f4f04fcca7cf8f67f;hp=caf921b743da51adef6f0d7a9337d9d5f498b720;hpb=b01aa41428d17df72015f7d45bae2a2659d47e38;p=cacao.git

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index caf921b74..7aa719ae3 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 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,55 +19,108 @@
 ##
 ## 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 1932 2005-02-10 10:57:02Z 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@
+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 USE_ZLIB
+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.c \
+	cycles-stats.h
+endif
+
+if ENABLE_ZLIB
 ZLIB_OBJ = \
-	unzip.c \
-	unzip.h
+	zip.c \
+	zip.h
 endif
 
-noinst_HEADERS = global.h
+noinst_HEADERS = \
+	global.h \
+	types.h
 
-noinst_LTLIBRARIES = libvmcore.la libvm.la
+noinst_LTLIBRARIES = \
+	libvmcore.la \
+	libvm.la
 
 libvmcore_la_SOURCES = \
+	access.c \
+	access.h \
 	builtin.c \
 	builtin.h \
+	builtintable.inc \
 	class.c \
 	class.h \
-	exceptions.c \
-	exceptions.h \
+	classcache.c \
+	classcache.h \
+	$(CYCLES_STATS_SOURCE) \
+	descriptor.c \
+	descriptor.h \
+	field.c \
+	field.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 \
-	statistics.c \
-	statistics.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 \
-	string.h \
-	tables.c \
-	tables.h \
+	stringlocal.h \
+	suck.c \
+	suck.h \
 	utf8.c \
 	utf8.h \
 	$(ZLIB_OBJ)
 
-libvm_la_SOURCES =
+libvm_la_SOURCES = \
+	exceptions.c \
+	exceptions.h \
+	vm.c \
+	vm.h
 
 libvm_la_LIBADD = \
 	libvmcore.la \