- build/dist/install changes

- gnu header for cacao makefiles

diff --git a/Makefile.am b/Makefile.am
index 1eda8cac24d65a3890f7a8358624585cb418d1f7..fb089f30a600c99d5acccfe63f44b741c642869b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,38 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $
+## Process this file with automake to produce Makefile.in

 
 MAINTAINERCLEANFILES = Makefile.in configure
 
 
 MAINTAINERCLEANFILES = Makefile.in configure
 

-SUBDIRS = doc src tests
+SUBDIRS = doc man src tests

 
 EXTRA_DIST = \
        html/cacaoinstall.html \
 
 EXTRA_DIST = \
        html/cacaoinstall.html \

diff --git a/configure.in b/configure.in
index b5214346990766fc6ae315179201787f72f29fec..d36890279a8ec0e3c7379f3c0b74ca0ddcb945a5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,6 @@
-dnl autoconf; autoheader; automake
-

 dnl Process this file with autoconf to produce a configure script.
 dnl Process this file with autoconf to produce a configure script.

-AC_INIT(cacao, 0.40, cacao@complang.tuwien.ac.at)
+
+AC_INIT(cacao, 0.90, cacao@complang.tuwien.ac.at)

 AC_CONFIG_SRCDIR(src/cacao/cacao.c)
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(src/cacao/cacao.c)
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)


@@ -11,6 +10,9 @@ AM_CONFIG_HEADER([config.h])
 
 AC_PREFIX_DEFAULT(/usr/local/cacao)
 
 
 AC_PREFIX_DEFAULT(/usr/local/cacao)
 

+dnl define install prefix
+CFLAGS="-DINSTALL_PREFIX=\"\\\"$prefix\\\"\""
+

 dnl system type
 
 case "$host_cpu" in
 dnl system type
 
 case "$host_cpu" in


@@ -18,8 +20,6 @@ alpha* )
        ARCH_DIR="alpha"
         STATIC_CLASSPATH="1"
        CFLAGS="-mieee -D__ALPHA__"
        ARCH_DIR="alpha"
         STATIC_CLASSPATH="1"
        CFLAGS="-mieee -D__ALPHA__"

-       AC_DEFINE([TRACE_ARGS_NUM], 6, [Defines integer argument register count])
-       AC_DEFINE([USE_CODEMMAP], 1, [use code mmap])

        ;;
 
 i386* | i486* | i586* | i686* )
        ;;
 
 i386* | i486* | i586* | i686* )


@@ -33,20 +33,18 @@ mips* )
         STATIC_CLASSPATH="1"
        CFLAGS="-64 -O2 -OPT:Olimit=0 -g -woff 1110,1164,1515 -D__MIPS__"
        LIBS="-lelfutil"
         STATIC_CLASSPATH="1"
        CFLAGS="-64 -O2 -OPT:Olimit=0 -g -woff 1110,1164,1515 -D__MIPS__"
        LIBS="-lelfutil"

-       AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])

        ;;
 
 powerpc* | ppc* )
        ARCH_DIR="powerpc"
         STATIC_CLASSPATH="1"
        CFLAGS="-D__POWERPC__"
        ;;
 
 powerpc* | ppc* )
        ARCH_DIR="powerpc"
         STATIC_CLASSPATH="1"
        CFLAGS="-D__POWERPC__"

-       AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])

        ;;
 
 x86_64* )
        ARCH_DIR="x86_64"
         STATIC_CLASSPATH="1"
        ;;
 
 x86_64* )
        ARCH_DIR="x86_64"
         STATIC_CLASSPATH="1"

-       CFLAGS="-D__X86_64__"
+       CFLAGS="$CFLAGS -D__X86_64__"

        ;;
 
 sparc* | * )
        ;;
 
 sparc* | * )


@@ -252,11 +250,6 @@ else
 fi
 
 
 fi
 
 

-dnl set some essential classpath options, even if their classpath default is
-dnl suitable for us
-ac_configure_args="$ac_configure_args --enable-jni --disable-cni --disable-regen-headers --enable-static --enable-shared --enable-load-library"
-
-

 dnl check arguments
 AC_ARG_ENABLE([gtk-peer], [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [[default=no]])])
 
 dnl check arguments
 AC_ARG_ENABLE([gtk-peer], [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [[default=no]])])
 


@@ -284,6 +277,11 @@ else
 fi
 
 
 fi
 
 

+dnl set some essential classpath options, even if their classpath default is
+dnl suitable for us
+ac_configure_args="$ac_configure_args --enable-jni --disable-cni --disable-regen-headers --enable-static --enable-shared --enable-load-library"
+
+

 dnl now configure boehm gc and gnu classpath
 dnl the export is not my favorite (is there another way?)
 export CFLAGS
 dnl now configure boehm gc and gnu classpath
 dnl the export is not my favorite (is there another way?)
 export CFLAGS


@@ -292,6 +290,8 @@ AC_CONFIG_SUBDIRS(src/boehm-gc src/classpath)
 
 AC_OUTPUT(Makefile \
           doc/Makefile \
 
 AC_OUTPUT(Makefile \
           doc/Makefile \

+          doc/handbook/Makefile \
+          man/Makefile \

           src/Makefile \
          src/cacao/Makefile \
           src/cacaoh/Makefile \
           src/Makefile \
          src/cacao/Makefile \
           src/cacaoh/Makefile \

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f8255caf4dc48503f326e9ea794757405a145dc7..3e703f2a4ed91e3456b1eca689ae783f58045556 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1,44 @@
-EXTRA_DIST=collect.doc threads.tex cacao.1 gen.doc
+## doc/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $
+
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = handbook
+
+
+## Local variables:
+## mode: Makefile
+## indent-tabs-mode: t
+## c-basic-offset: 4
+## tab-width: 8
+## compile-command: "automake --add-missing"
+## End:

diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
new file mode 100644 (file)
index 0000000..59d81f1
--- /dev/null
+++ b/doc/handbook/Makefile.am
@@ -0,0 +1,72 @@
+## doc/handbook/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $
+
+## Process this file with automake to produce Makefile.in
+
+dist_noinst_DATA = \
+       alpha.tex \
+       cacao.tex \
+       inlining.tex \
+       intro.tex \
+       java.bib \
+       jit.tex \
+       library.tex \
+       loader.tex \
+       loopopt.tex \
+       mips.tex \
+       native.tex \
+       overview.tex \
+       powerpc.tex \
+       reflection.tex \
+       runtime.tex \
+       threads.tex \
+       verification.tex \
+       x86.tex \
+       x86_64.tex
+
+handbook:
+       latex cacao
+       bibtex cacao
+       latex cacao
+       latex cacao
+
+clean:
+       rm -f *.aux *.bbl *.blg *.dvi *.lof *.log *.lot *.toc
+
+
+## Local variables:
+## mode: Makefile
+## indent-tabs-mode: t
+## c-basic-offset: 4
+## tab-width: 8
+## compile-command: "automake --add-missing"
+## End:

diff --git a/src/Makefile.am b/src/Makefile.am
index 5101ed01027ec118171af166764d301546bc4444..50e3044c4fb1dbf7874b07cdf639a483a9eed30e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,34 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $
+## Process this file with automake to produce Makefile.in

 
 SUBDIRS = boehm-gc classpath mm toolbox vm threads cacaoh native cacao
 
 
 SUBDIRS = boehm-gc classpath mm toolbox vm threads cacaoh native cacao
 

diff --git a/src/boehm-gc/Makefile.am b/src/boehm-gc/Makefile.am
index 2aba243231f66c026a34ff2492669cfb3b20f81e..fe2e668bffa6c14d380af67c8de8caa0669ec9b4 100644 (file)
--- a/src/boehm-gc/Makefile.am
+++ b/src/boehm-gc/Makefile.am
@@ -30,11 +30,11 @@ extra = libgccpp.la
 else
 extra = 
 endif
 else
 extra = 
 endif

-lib_LTLIBRARIES = libgc.la $(extra) 
+noinst_LTLIBRARIES = libgc.la $(extra)

 
 

-include_HEADERS = include/gc.h include/gc_local_alloc.h \
-include/gc_pthread_redirects.h include/gc_config_macros.h \
-include/leak_detector.h include/gc_typed.h @addincludes@
+#include_HEADERS = include/gc.h include/gc_local_alloc.h \
+#include/gc_pthread_redirects.h include/gc_config_macros.h \
+#include/leak_detector.h include/gc_typed.h @addincludes@

 
 EXTRA_HEADERS = include/gc_cpp.h include/gc_allocator.h
 
 
 EXTRA_HEADERS = include/gc_cpp.h include/gc_allocator.h
 

diff --git a/src/boehm-gc/doc/Makefile.am b/src/boehm-gc/doc/Makefile.am
index 9446bcb1ad357ee77480a5c25614be6a17ff07e0..a849aadade13e8a92bfa3663ca170858761ad22e 100644 (file)
--- a/src/boehm-gc/doc/Makefile.am
+++ b/src/boehm-gc/doc/Makefile.am
@@ -15,7 +15,7 @@
 
 # installed documentation
 #
 
 # installed documentation
 #

-dist_pkgdata_DATA = barrett_diagram debugging.html gc.man \
+dist_noinst_DATA = barrett_diagram debugging.html gc.man \

     gcdescr.html README README.amiga README.arm.cross \
     README.autoconf README.changes README.contributors \
     README.cords README.DGUX386 README.dj README.environment \
     gcdescr.html README README.amiga README.arm.cross \
     README.autoconf README.changes README.contributors \
     README.cords README.DGUX386 README.dj README.environment \

diff --git a/src/boehm-gc/include/Makefile.am b/src/boehm-gc/include/Makefile.am
index 306026b0a8ace853bef42919ee899e655a8794fd..4224ba496c0af36db8685b05f1dab168fe251075 100644 (file)
--- a/src/boehm-gc/include/Makefile.am
+++ b/src/boehm-gc/include/Makefile.am
@@ -15,7 +15,7 @@
 
 # installed headers
 #
 
 # installed headers
 #

-pkginclude_HEADERS = gc.h gc_typed.h gc_inl.h \
+dist_noinst_HEADERS = gc.h gc_typed.h gc_inl.h \

     gc_inline.h gc_mark.h gc_cpp.h \
     weakpointer.h gc_alloc.h new_gc_alloc.h \
     gc_allocator.h gc_backptr.h \
     gc_inline.h gc_mark.h gc_cpp.h \
     weakpointer.h gc_alloc.h new_gc_alloc.h \
     gc_allocator.h gc_backptr.h \


@@ -25,7 +25,7 @@ pkginclude_HEADERS = gc.h gc_typed.h gc_inl.h \
 
 # headers which are not installed
 #
 
 # headers which are not installed
 #

-dist_noinst_HEADERS = private/gc_hdrs.h \
+dist_noinst_HEADERS += private/gc_hdrs.h \

     private/gc_priv.h private/gcconfig.h \
     private/gc_pmark.h private/gc_locks.h \
     private/solaris_threads.h private/dbg_mlc.h \
     private/gc_priv.h private/gcconfig.h \
     private/gc_pmark.h private/gc_locks.h \
     private/solaris_threads.h private/dbg_mlc.h \

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index 6d0c0fcd36f46e28f586d27036da0564c07a519e..0ab02d3f0ef8ec8fad47b1ee785ac25639a7586f 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -1,10 +1,39 @@
-## Process this file with automake to produce Makefile.in
+## cacao/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1646 2004-12-01 16:02:23Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 

-

 if USE_THREADS
 if NATIVE_THREADS
 THREAD_LIB = $(top_srcdir)/src/threads/native/libthreads.a
 if USE_THREADS
 if NATIVE_THREADS
 THREAD_LIB = $(top_srcdir)/src/threads/native/libthreads.a


@@ -15,7 +44,6 @@ else
 THREAD_LIB =
 endif
 
 THREAD_LIB =
 endif
 

-

 if STATIC_CLASSPATH
 cacao_LDFLAGS =
 CLASSPATH_LIBS = \
 if STATIC_CLASSPATH
 cacao_LDFLAGS =
 CLASSPATH_LIBS = \


@@ -36,7 +64,6 @@ cacao_LDFLAGS = -ldl -Wl,--export-dynamic
 CLASSPATH_LIBS =
 endif
 
 CLASSPATH_LIBS =
 endif
 

-

 if USE_GTK_PEER
 cacao_LDFLAGS += \
        -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0 \
 if USE_GTK_PEER
 cacao_LDFLAGS += \
        -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangoxft-1.0 \


@@ -44,10 +71,13 @@ cacao_LDFLAGS += \
        -lgthread-2.0 -lart_lgpl_2
 endif
 
        -lgthread-2.0 -lart_lgpl_2
 endif
 

+bindir = $(prefix)/jre/bin

 
 bin_PROGRAMS = cacao
 
 
 bin_PROGRAMS = cacao
 

-cacao_SOURCES = cacao.c
+cacao_SOURCES = \
+       cacao.c \
+       cacao.h

 
 cacao_LDADD = \
        $(top_srcdir)/src/mm/libmm.a \
 
 cacao_LDADD = \
        $(top_srcdir)/src/mm/libmm.a \

diff --git a/src/cacaoh/Makefile.am b/src/cacaoh/Makefile.am
index 80f9c399f82540d4c3ff178d448b3d553458cce0..588b6c92e56aa37feb8740749ae8e0443563257a 100644 (file)
--- a/src/cacaoh/Makefile.am
+++ b/src/cacaoh/Makefile.am
@@ -1,6 +1,34 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 


@@ -14,11 +42,13 @@ else
 THREAD_LIB =
 endif
 
 THREAD_LIB =
 endif
 

+bindir = $(prefix)/jre/bin

 bin_PROGRAMS = cacaoh
 
 cacaoh_SOURCES = \
        cacaoh.c \
 bin_PROGRAMS = cacaoh
 
 cacaoh_SOURCES = \
        cacaoh.c \

-       headers.c
+       headers.c \
+       headers.h

 
 cacaoh_LDADD = \
        $(top_srcdir)/src/mm/libmm.a \
 
 cacaoh_LDADD = \
        $(top_srcdir)/src/mm/libmm.a \

diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am
index 74eb15049b7cbf8ac0371a85874cf2dd3ff2fc20..d5eb73c71e30019d8ab5d1ffd8879c715875410c 100644 (file)
--- a/src/mm/Makefile.am
+++ b/src/mm/Makefile.am
@@ -1,14 +1,44 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 noinst_LIBRARIES = libmm.a
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 noinst_LIBRARIES = libmm.a
 

-noinst_HEADERS = boehm.h memory.h
-
-libmm_a_SOURCES = boehm.c memory.c
+libmm_a_SOURCES = \
+       boehm.c \
+       boehm.h \
+       memory.c \
+       memory.h

 
 
 ## Local variables:
 
 
 ## Local variables:

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 37705cfeaab1aec5f7ed68e124c743afdf5da6a7..8da106a4673d1e2d38efae75cf669c488bbe7afd 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -1,6 +1,36 @@
-## Process this file with automake to produce Makefile.in
+## native/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1655 2004-12-02 16:51:20Z carolyn $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 


@@ -13,7 +43,10 @@ noinst_LIBRARIES = libnative.a
 
 libnative_a_SOURCES = \
        jni.c \
 
 libnative_a_SOURCES = \
        jni.c \

-       native.c
+       jni.h \
+       native.c \
+       native.h \
+       nativecalls.inc

 
 native.c: nativetable.inc nativecalls.inc
 
 
 native.c: nativetable.inc nativecalls.inc
 


@@ -21,7 +54,7 @@ if USE_GTK_PEER
 AWT_HEADERS_TOUCH_FILE = $(srcdir)/include/awtheaders-generated
 endif
 
 AWT_HEADERS_TOUCH_FILE = $(srcdir)/include/awtheaders-generated
 endif
 

-nativetable.inc: $(top_srcdir)/src/classpath/lib/bootstrap.zip $(top_srcdir)/config.h $(srcdir)/include/headers-generated $(AWT_HEADERS_TOUCH_FILE)
+nativetable.inc: $(top_srcdir)/src/classpath/lib/bootstrap.zip $(srcdir)/tools/gennativetable $(top_srcdir)/config.h $(srcdir)/include/headers-generated $(AWT_HEADERS_TOUCH_FILE)

        CLASSPATH=$(top_srcdir)/src/classpath/lib/bootstrap.zip \
        $(top_srcdir)/src/native/tools/gennativetable \
        $(NO_REGEN_CLASSES) \
        CLASSPATH=$(top_srcdir)/src/classpath/lib/bootstrap.zip \
        $(top_srcdir)/src/native/tools/gennativetable \
        $(NO_REGEN_CLASSES) \

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 558f74276d264b0387db0b3acfb3c3c71f24f23b..7b259337195f50fc28471a6efbcb589c0678991f 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -1,6 +1,34 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1645 2004-12-01 14:06:44Z twisti $
+## Process this file with automake to produce Makefile.in

 
 CLEANFILES = \
        headers-generated \
 
 CLEANFILES = \
        headers-generated \


@@ -142,6 +170,17 @@ CLEANFILES = \
 # include NO_REGEN_CLASSES, CLASSES and AWT_CLASSES
 include $(srcdir)/../classes.am
 
 # include NO_REGEN_CLASSES, CLASSES and AWT_CLASSES
 include $(srcdir)/../classes.am
 

+noinst_HEADERS = \
+       java_lang_ClassLoader.h \
+       java_lang_Cloneable.h \
+       java_lang_Object.h \
+       java_lang_String.h \
+       java_lang_Thread.h \
+       java_lang_ThreadGroup.h \
+       java_lang_Throwable.h \
+       java_lang_VMObject.h \
+       java_lang_VMThread.h
+

 noinst_DATA = headers-generated
 
 if USE_GTK_PEER
 noinst_DATA = headers-generated
 
 if USE_GTK_PEER

diff --git a/src/native/vm/Makefile.am b/src/native/vm/Makefile.am
index c2186a438eb85b609450425b87c6bbd2b30a70fe..36af5904ebadc9b1fdd96585e59305c500e30f67 100644 (file)
--- a/src/native/vm/Makefile.am
+++ b/src/native/vm/Makefile.am
@@ -1,6 +1,34 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1645 2004-12-01 14:06:44Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 


@@ -35,6 +63,7 @@ implementednatives.data: $(libnativevm_a_SOURCES)
                        fi ; \
                done )
 
                        fi ; \
                done )
 

+

 ## Local variables:
 ## mode: Makefile
 ## indent-tabs-mode: t
 ## Local variables:
 ## mode: Makefile
 ## indent-tabs-mode: t

diff --git a/src/threads/Makefile.am b/src/threads/Makefile.am
index 5cced033b013a3876ac0f83f82ed53207876311a..12c417692522a36bf4137817e7010e96e3155e99 100644 (file)
--- a/src/threads/Makefile.am
+++ b/src/threads/Makefile.am
@@ -1,20 +1,45 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $
+## Process this file with automake to produce Makefile.in

 
 if USE_THREADS
 if NATIVE_THREADS
 
 if USE_THREADS
 if NATIVE_THREADS

-THREADS = native
+SUBDIRS = native

 else
 else

-THREADS = green
+SUBDIRS = green

 endif
 else
 endif
 else

-THREADS =
-LIBRARY =
+SUBDIRS =

 endif
 
 endif
 

-SUBDIRS = $(THREADS)
-

 
 ## Local variables:
 ## mode: Makefile
 
 ## Local variables:
 ## mode: Makefile

diff --git a/src/threads/green/Makefile.am b/src/threads/green/Makefile.am
index 6b2be3761a79d7d9dd5305f621d5290e35aa1502..53642b85d4bb8d02f81a6e930c6dfd583ad02fbc 100644 (file)
--- a/src/threads/green/Makefile.am
+++ b/src/threads/green/Makefile.am
@@ -1,13 +1,46 @@
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $
+

 ## Process this file with automake to produce Makefile.in
 
 ## Process this file with automake to produce Makefile.in
 

-# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@

 
 noinst_LIBRARIES = libthreads.a
 
 libthreads_a_SOURCES = \
        locks.c \
 
 noinst_LIBRARIES = libthreads.a
 
 libthreads_a_SOURCES = \
        locks.c \

+       locks.h \

        threads.c \
        threads.c \

-       threadio.c
+       threads.h \
+       threadio.c \
+       threadio.h

 
 
 ## Local variables:
 
 
 ## Local variables:

diff --git a/src/threads/native/Makefile.am b/src/threads/native/Makefile.am
index d8aead7337cc884b4cabef51ee97d5699a444994..d4c1e7ec304cfed5aabc7ad5f7d7d71c7005dd69 100644 (file)
--- a/src/threads/native/Makefile.am
+++ b/src/threads/native/Makefile.am
@@ -1,12 +1,42 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 noinst_LIBRARIES = libthreads.a
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 noinst_LIBRARIES = libthreads.a
 

-libthreads_a_SOURCES = threads.c
+libthreads_a_SOURCES = \
+       threads.c \
+       threads.h

 
 
 ## Local variables:
 
 
 ## Local variables:

diff --git a/src/toolbox/Makefile.am b/src/toolbox/Makefile.am
index 7fbe098faf117775e69589b8379fb1151c896ffc..904143bc66faa25e37ebb6de1f939ca84f929935 100644 (file)
--- a/src/toolbox/Makefile.am
+++ b/src/toolbox/Makefile.am
@@ -1,6 +1,34 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 


@@ -8,10 +36,15 @@ noinst_LIBRARIES = libtoolbox.a
 
 libtoolbox_a_SOURCES = \
        avl.c \
 
 libtoolbox_a_SOURCES = \
        avl.c \

+       avl.h \

        logging.c \
        logging.c \

+       logging.h \

        chain.c \
        chain.c \

+       chain.h \

        tree.c \
        tree.c \

-       list.c
+       tree.h \
+       list.c \
+       list.h

 
 
 ## Local variables:
 
 
 ## Local variables:

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index 453f44128024070dab8a4928c314c19ec5deb188..99e8e709f0467de1636189e82329f2341485c608 100644 (file)
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -1,24 +1,62 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 SUBDIRS = jit
 
 if USE_ZLIB
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 SUBDIRS = jit
 
 if USE_ZLIB

-ZLIB_OBJ = unzip.c
+ZLIB_OBJ = \
+       unzip.c \
+       unzip.h

 endif
 
 endif
 

+noinst_HEADERS = global.h
+

 noinst_LIBRARIES = libvm.a
 
 libvm_a_SOURCES = \
        builtin.c \
 noinst_LIBRARIES = libvm.a
 
 libvm_a_SOURCES = \
        builtin.c \

+       builtin.h \

        exceptions.c \
        exceptions.c \

+       exceptions.h \

        loader.c \
        loader.c \

+       loader.h \

        options.c \
        options.c \

+       options.h \

        statistics.c \
        statistics.c \

+       statistics.h \

        tables.c \
        tables.c \

+       tables.h \

        $(ZLIB_OBJ)
 
 
        $(ZLIB_OBJ)
 
 

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 49b00bdd09e225bd3b6141a205c2a92bf1374afa..5d719c47b35d3da41c1e60a12adbcfdf06a2b97f 100644 (file)
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -1,6 +1,34 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 


@@ -8,17 +36,24 @@ SUBDIRS = inline loop verify tools @ARCH_DIR@
 
 DIST_SUBDIRS = inline loop verify tools alpha i386 mips powerpc x86_64
 
 
 DIST_SUBDIRS = inline loop verify tools alpha i386 mips powerpc x86_64
 

+noinst_HEADERS = \
+       asmpart.h \
+       codegen.inc \
+       codegen.inc.h \
+       lsra.inc \
+       lsra.h \
+       reg.inc \
+       reg.h
+

 noinst_LIBRARIES = libjit.a
 
 libjit_a_SOURCES = \
        jit.c \
 noinst_LIBRARIES = libjit.a
 
 libjit_a_SOURCES = \
        jit.c \

+       jit.h \

        parse.c \
        parse.c \

-       stack.c
-
-libjit_a_LIBADD = \
-       inline/libinline.a \
-       loop/libloop.a \
-       verify/libverify.a
+       parse.h \
+       stack.c \
+       stack.h

 
 
 ## Local variables:
 
 
 ## Local variables:

diff --git a/src/vm/jit/alpha/Makefile.am b/src/vm/jit/alpha/Makefile.am
index d8084946f983445ca261332f8571b6566f4d4c07..300b7975c5fc89a996e69f23729f4ad88c1fc1ca 100644 (file)
--- a/src/vm/jit/alpha/Makefile.am
+++ b/src/vm/jit/alpha/Makefile.am
@@ -1,17 +1,40 @@
-## Process this file with automake to produce Makefile.in
+## 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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1624 2004-11-30 14:49:45Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src
 
 
 INCLUDES = -I$(top_srcdir)/src
 

-EXTRA_DIST = \
-       asmpart.S \
-       disass.c \
-       disass.h \
-       native-math.h \
+noinst_HEADERS = \
+       arch.h \

        machine-instr.h \
        machine-instr.h \

-       codegen.c \
-       codegen.h \

        types.h
 
 noinst_LIBRARIES = libarch.a
        types.h
 
 noinst_LIBRARIES = libarch.a


@@ -19,7 +42,9 @@ noinst_LIBRARIES = libarch.a
 libarch_a_SOURCES = \
        asmpart.S \
        codegen.c \
 libarch_a_SOURCES = \
        asmpart.S \
        codegen.c \

-       disass.c
+       codegen.h \
+       disass.c \
+       disass.h

 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<
 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<

diff --git a/src/vm/jit/i386/Makefile.am b/src/vm/jit/i386/Makefile.am
index 792b49f530ad382962f4df0b71494aed4ad610f4..539a06e0c9bc85299f15241cd1ba8dfd09f74c55 100644 (file)
--- a/src/vm/jit/i386/Makefile.am
+++ b/src/vm/jit/i386/Makefile.am
@@ -1,19 +1,42 @@
-## Process this file with automake to produce Makefile.in
+## vm/jit/i386/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1623 2004-11-30 14:18:19Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src
 
 
 INCLUDES = -I$(top_srcdir)/src
 

-EXTRA_DIST = \
-       asmpart.S \
+noinst_HEADERS = \
+       arch.h \

        bfd.h \
        bfd.h \

-       codegen.c \
-       codegen.h \
-       dis-asm.h \
-       disass.c \
-       disass.h \
-       emitfuncs.c \
-       emitfuncs.h \

        machine-instr.h \
        types.h
 
        machine-instr.h \
        types.h
 


@@ -22,15 +45,19 @@ noinst_LIBRARIES = libarch.a
 libarch_a_SOURCES = \
        asmpart.S \
        codegen.c \
 libarch_a_SOURCES = \
        asmpart.S \
        codegen.c \

+       codegen.h \

        dis-buf.c \
        dis-buf.c \

+       dis-asm.h \

        disass.c \
        disass.c \

+       disass.h \

        emitfuncs.c \
        emitfuncs.c \

+       emitfuncs.h \

        i386-dis.c
 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<
 
        i386-dis.c
 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<
 

-offsets.h: $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h
+offsets.h: $(top_srcdir)/src/vm/jit/tools/genoffsets $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h

        $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h
 
 
        $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h
 
 

diff --git a/src/vm/jit/inline/Makefile.am b/src/vm/jit/inline/Makefile.am
index ce904c73885d6059a3061495bbcae6c5e247380e..2e7a33277daf5b6df1b41900bbdc3941cefb181a 100644 (file)
--- a/src/vm/jit/inline/Makefile.am
+++ b/src/vm/jit/inline/Makefile.am
@@ -1,6 +1,36 @@
-## Process this file with automake to produce Makefile.in
+## vm/jit/inline/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 


@@ -8,9 +38,15 @@ noinst_LIBRARIES = libinline.a
 
 libinline_a_SOURCES = \
        inline.c \
 
 libinline_a_SOURCES = \
        inline.c \

+       inline.h \

        parseRT.c \
        parseRT.c \

+       parseRT.h \
+       parseRTflags.h \
+       parseRTprint.h \

        parseRTstats.c \
        parseRTstats.c \

-       sets.c
+       parseRTstats.h \
+       sets.c \
+       sets.h

 
 
 ## Local variables:
 
 
 ## Local variables:

diff --git a/src/vm/jit/loop/Makefile.am b/src/vm/jit/loop/Makefile.am
index 29ab8c4b84adf0ea585c709229bd0faffa3fe903..32987cb82a1ee0d090a903a5c6918b5def8e93c0 100644 (file)
--- a/src/vm/jit/loop/Makefile.am
+++ b/src/vm/jit/loop/Makefile.am
@@ -1,6 +1,36 @@
-## Process this file with automake to produce Makefile.in
+## vm/jit/loop/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 


@@ -8,9 +38,13 @@ noinst_LIBRARIES = libloop.a
 
 libloop_a_SOURCES = \
        analyze.c \
 
 libloop_a_SOURCES = \
        analyze.c \

+       analyze.h \

        graph.c \
        graph.c \

+       graph.h \

        loop.c \
        loop.c \

-       tracing.c
+       loop.h \
+       tracing.c \
+       tracing.h

 
 
 ## Local variables:
 
 
 ## Local variables:

diff --git a/src/vm/jit/mips/Makefile.am b/src/vm/jit/mips/Makefile.am
index 772d8d3f6c8fda69617a8d02e332dc5dc0ce7714..2425e233bec32e862e436b02f80e7dcb91369415 100644 (file)
--- a/src/vm/jit/mips/Makefile.am
+++ b/src/vm/jit/mips/Makefile.am
@@ -1,26 +1,58 @@
-## Process this file with automake to produce Makefile.in
+## vm/jit/mips/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1638 2004-12-01 10:42:28Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src
 
 
 INCLUDES = -I$(top_srcdir)/src
 

-EXTRA_DIST = \
-       asmpart.S \
-       disass.c \
-       disass.h \
-       codegen.c \
-       codegen.h \
+noinst_HEADERS = \
+       arch.h \
+       machine-instr.h \

        types.h
 
 noinst_LIBRARIES = libarch.a
 
        types.h
 
 noinst_LIBRARIES = libarch.a
 

-libarch_a_SOURCES = asmpart.S codegen.c disass.c
+libarch_a_SOURCES = \
+       asmpart.S \
+       codegen.c \
+       codegen.h \
+       disass.c \
+       disass.h

 
 

-asmpart.o: asmpart.S offsets.h
+asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h

        $(COMPILE) -E asmpart.S > asmpart.s
        $(AS) -64 -KPIC -O -o asmpart.o asmpart.s
 
        $(COMPILE) -E asmpart.S > asmpart.s
        $(AS) -64 -KPIC -O -o asmpart.o asmpart.s
 

-offsets.h: $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h
+offsets.h: $(top_srcdir)/src/vm/jit/tools/genoffsets $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h

        $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h
 
 
        $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h
 
 

diff --git a/src/vm/jit/powerpc/Makefile.am b/src/vm/jit/powerpc/Makefile.am
index 3e12219ea72932a0b1497d62bb88db1112fd1e14..a0cbd1f9e47a11483282006a6bcd1e69ea4d5700 100644 (file)
--- a/src/vm/jit/powerpc/Makefile.am
+++ b/src/vm/jit/powerpc/Makefile.am
@@ -1,20 +1,42 @@
-## Process this file with automake to produce Makefile.in
+## vm/jit/powerpc/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1635 2004-12-01 09:57:58Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src
 
 
 INCLUDES = -I$(top_srcdir)/src
 

-EXTRA_DIST = \
-       asmpart.S \
-       codegen.c \
-       codegen.h \
-       dis-asm.h \
-       disass.c \
-       disass.h \
+noinst_HEADERS = \
+       arch.h \

        machine-instr.h \
        machine-instr.h \

-       ppc-dis.c \
-       ppc-opc.c
-       ppc.h \

        types.h
 
 noinst_LIBRARIES = libarch.a
        types.h
 
 noinst_LIBRARIES = libarch.a


@@ -22,9 +44,13 @@ noinst_LIBRARIES = libarch.a
 libarch_a_SOURCES = \
        asmpart.S \
        codegen.c \
 libarch_a_SOURCES = \
        asmpart.S \
        codegen.c \

+       codegen.h \
+       dis-asm.h \

        disass.c \
        disass.c \

+       disass.h \

        ppc-dis.c \
        ppc-dis.c \

-       ppc-opc.c
+       ppc-opc.c \
+       ppc.h

 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<
 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<

diff --git a/src/vm/jit/tools/Makefile.am b/src/vm/jit/tools/Makefile.am
index 6782ebe0dd622f156160389eafca73a510b7fa1c..028106fff72a71f6635273de92576cf7a4df7a1d 100644 (file)
--- a/src/vm/jit/tools/Makefile.am
+++ b/src/vm/jit/tools/Makefile.am
@@ -1,6 +1,36 @@
-## Process this file with automake to produce Makefile.in
+## vm/jit/tools/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 

diff --git a/src/vm/jit/verify/Makefile.am b/src/vm/jit/verify/Makefile.am
index 02bfbdfc080339804109a437811a671753fc8809..52c02bf12a66e6d85c5d452ff1ae02fea47f7a96 100644 (file)
--- a/src/vm/jit/verify/Makefile.am
+++ b/src/vm/jit/verify/Makefile.am
@@ -1,6 +1,36 @@
-## Process this file with automake to produce Makefile.in
+## vm/jit/verify/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-# $Id: Makefile.am 1622 2004-11-30 13:18:52Z twisti $
+## Process this file with automake to produce Makefile.in

 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
 


@@ -8,7 +38,9 @@ noinst_LIBRARIES = libverify.a
 
 libverify_a_SOURCES = \
        typecheck.c \
 
 libverify_a_SOURCES = \
        typecheck.c \

-       typeinfo.c
+       typecheck.h \
+       typeinfo.c \
+       typeinfo.h

 
 
 ## Local variables:
 
 
 ## Local variables:

diff --git a/src/vm/jit/x86_64/Makefile.am b/src/vm/jit/x86_64/Makefile.am
index e50dbff65b504f6904745dcb6d005a829ba4c29a..6cd82272ae8d7c36e83e5f530919d81e03c6e517 100644 (file)
--- a/src/vm/jit/x86_64/Makefile.am
+++ b/src/vm/jit/x86_64/Makefile.am
@@ -1,11 +1,48 @@
+## vm/jit/x86_64/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $
+

 ## Process this file with automake to produce Makefile.in
 
 ## Process this file with automake to produce Makefile.in
 

-# $Id: Makefile.am 1621 2004-11-30 13:06:55Z twisti $
+INCLUDES = -I$(top_srcdir)/src

 
 

+noinst_HEADERS = \
+       arch.h \
+       machine-instr.h \
+       types.h

 
 

-INCLUDES = -I$(top_srcdir)/src
+noinst_LIBRARIES = libarch.a

 
 

-EXTRA_DIST = \
+libarch_a_SOURCES = \
+       ansidecl.h \

        asmpart.S \
        bfd.h \
        codegen.c \
        asmpart.S \
        bfd.h \
        codegen.c \


@@ -17,22 +54,12 @@ EXTRA_DIST = \
        emitfuncs.c \
        emitfuncs.h \
        i386-dis.c \
        emitfuncs.c \
        emitfuncs.h \
        i386-dis.c \

-       types.h
-
-noinst_LIBRARIES = libarch.a
-
-libarch_a_SOURCES = \
-       asmpart.S \
-       codegen.c \
-       dis-buf.c \
-       disass.c \
-       emitfuncs.c \
-       i386-dis.c
+       symcat.h

 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<
 
 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<
 

-offsets.h: $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h
+offsets.h: $(top_srcdir)/src/vm/jit/tools/genoffsets $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h

        $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h
 
 
        $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h
 
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d72e6c579aaa1ddd8754bfe79cbfd92871492b6b..135643ad3fa5f46257bede07b292f91bd3fafce2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,38 @@
-SUBDIRS = kaffe
+## tests/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $
+
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = jvm98 kaffe

 
 EXTRA_DIST = \
        x.java x.output \
 
 EXTRA_DIST = \
        x.java x.output \


@@ -10,16 +44,28 @@ EXTRA_DIST = \
        extest.java extest.output \
        GCBench.java
 
        extest.java extest.output \
        GCBench.java
 

+JAVA = $(top_srcdir)/src/cacao/cacao
+JAVAC = jikes -nowarn
+

 check_DATA = checkall
 
 checkall: x.tst jctest.tst TestArrayClasses.tst BasicToStrings.tst fp.tst fptest.tst extest.tst GCBench.tstrun
 
 %.tst:
 check_DATA = checkall
 
 checkall: x.tst jctest.tst TestArrayClasses.tst BasicToStrings.tst fp.tst fptest.tst extest.tst GCBench.tstrun
 
 %.tst:

-       ../cacao -classpath . -log /dev/null sun.tools.javac.Main $*.java
-       ../cacao -classpath . -log /dev/null $* >$*.thisoutput
+       $(JAVAC) $*.java
+       $(JAVA) $* > $*.thisoutput

        diff --brief $*.output $*.thisoutput
        rm -f $*.thisoutput
 
 %.tstrun:
        diff --brief $*.output $*.thisoutput
        rm -f $*.thisoutput
 
 %.tstrun:

-       ../cacao -classpath . -log /dev/null sun.tools.javac.Main $*.java
-       ../cacao -classpath . -log /dev/null $*
+       $(JAVAC) $*.java
+       $(JAVA) $*
+
+
+## Local variables:
+## mode: Makefile
+## indent-tabs-mode: t
+## c-basic-offset: 4
+## tab-width: 8
+## compile-command: "automake --add-missing"
+## End:

diff --git a/tests/jvm98/Makefile.am b/tests/jvm98/Makefile.am
index 49a9882985dceeb213855ba42f5f40caebfd7b09..70df15d4139fcab82485cc19e7dfd60ad7527e2e 100644 (file)
--- a/tests/jvm98/Makefile.am
+++ b/tests/jvm98/Makefile.am
@@ -1,7 +1,47 @@
-EXTRA_DIST = check.diff compress.diff compress.output db.diff db.output javac.diff javac.output mpegaudio.diff mpegaudio.output raytrace.diff raytrace.output
+## tests/jvm98/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $

 
 

-JAVA = ../../cacao
-JAVAC = $(JAVA) at.dms.kjc.Main
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = \
+       check.diff \
+       compress.diff compress.output \
+       db.diff db.output \
+       javac.diff javac.output \
+       mpegaudio.diff mpegaudio.output \
+       raytrace.diff raytrace.output
+
+JAVA = $(top_srcdir)/src/cacao/cacao
+JAVAC = jikes

 
 checkjvm: compress db javac mpegaudio raytrace 
 
 
 checkjvm: compress db javac mpegaudio raytrace 
 


@@ -21,3 +61,12 @@ check compress db javac mpegaudio raytrace: force
        rm -rf $@
 
 force:
        rm -rf $@
 
 force:

+
+
+## Local variables:
+## mode: Makefile
+## indent-tabs-mode: t
+## c-basic-offset: 4
+## tab-width: 8
+## compile-command: "automake --add-missing"
+## End:

diff --git a/tests/kaffe/Makefile.am b/tests/kaffe/Makefile.am
index 82c37624788cde2575042c1edd6c316a36d19ad7..96cc4af5a4681fd317188315f35a12b679b23207 100644 (file)
--- a/tests/kaffe/Makefile.am
+++ b/tests/kaffe/Makefile.am
@@ -1,3 +1,37 @@
+## tests/kaffe/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,
+## TU Wien
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## 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.
+##
+## Contact: cacao@complang.tuwien.ac.at
+##
+## Authors: Christian Thalinger
+##
+## Changes:
+##
+## $Id: Makefile.am 1676 2004-12-03 16:52:15Z twisti $
+
+## Process this file with automake to produce Makefile.in
+

 TESTS_ENVIRONMENT = $(SHELL) TestScript
 
 ALWAYS_TESTS = HelloWorldApp.class.save \
 TESTS_ENVIRONMENT = $(SHELL) TestScript
 
 ALWAYS_TESTS = HelloWorldApp.class.save \


@@ -126,3 +160,12 @@ EXTRA_DIST = TestScript $(ALWAYS_TESTS) \
 
 CLEANFILES = *.class *.fail *.out core *.core ExceptionTest ziptest1.zip \
        ziptest2.zip frozen_serial *.tmp
 
 CLEANFILES = *.class *.fail *.out core *.core ExceptionTest ziptest1.zip \
        ziptest2.zip frozen_serial *.tmp

+
+
+## Local variables:
+## mode: Makefile
+## indent-tabs-mode: t
+## c-basic-offset: 4
+## tab-width: 8
+## compile-command: "automake --add-missing"
+## End: